cookutils rev 1119

modules/pack: undo implicit copying when genpkg_rules() exists
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Dec 21 16:27:11 2018 +0200 (2018-12-21)
parents f690206c7258
children b995643e42ca
files modules/pack
line diff
     1.1 --- a/modules/pack	Thu Dec 20 18:33:57 2018 +0200
     1.2 +++ b/modules/pack	Fri Dec 21 16:27:11 2018 +0200
     1.3 @@ -549,12 +549,14 @@
     1.4  	[ -n "$CAT" ] && CATEGORY=$(echo "$CAT" | cut -d'|' -f1)
     1.5  
     1.6  	if [ "$CATEGORY" != 'meta' -a "$CATEGORY" != 'nopack' ]; then
     1.7 -		[ -n "$COPY" ] ||
     1.8 -		case "$thispkg" in
     1.9 -			$basepkg)    COPY='@std @rm';;
    1.10 -			*-dev)       COPY='@dev @rm';;
    1.11 -			lib$basepkg) COPY='*.so*';;
    1.12 -		esac
    1.13 +		if [ -z "$COPY" -a "$require_copy" == 'yes' ]; then
    1.14 +			case "$thispkg" in
    1.15 +				$basepkg)    COPY='@std @rm';;
    1.16 +				*-dev)       COPY='@dev @rm';;
    1.17 +				lib$basepkg) COPY='*.so*';;
    1.18 +			esac
    1.19 +		fi
    1.20 +
    1.21  		if [ -n "$COPY" ]; then
    1.22  			copy $COPY
    1.23  		elif [ "$require_copy" == 'yes' ]; then