wok-next diff screen/receipt @ rev 20292

Up warzone2100; add pulse; tiny edits for fresh *-pam changes
author Aleksej Bobylev <al.bobylev@gmail.com>
date Wed Nov 08 19:39:57 2017 +0200 (2017-11-08)
parents 2ec88e5df2dd
children 1ff723a6455b
line diff
     1.1 --- a/screen/receipt	Wed Nov 08 17:03:48 2017 +0100
     1.2 +++ b/screen/receipt	Wed Nov 08 19:39:57 2017 +0200
     1.3 @@ -17,19 +17,26 @@
     1.4  compile_rules()
     1.5  {
     1.6  	cp -a $src $src-pam
     1.7 -	./configure --with-sys-screenrc=/etc/screenrc \
     1.8 -		--disable-pam $CONFIGURE_ARGS &&
     1.9 +
    1.10 +	./configure \
    1.11 +		--with-sys-screenrc=/etc/screenrc \
    1.12 +		--disable-pam \
    1.13 +		$CONFIGURE_ARGS &&
    1.14  	make &&
    1.15 -	make -j1 DESTDIR=$DESTDIR install &&
    1.16 -	cd $src-pam &&
    1.17 -	./configure --with-sys-screenrc=/etc/screenrc \
    1.18 -		--enable-pam $CONFIGURE_ARGS &&
    1.19 +	make -j1 DESTDIR=$DESTDIR install || return 1
    1.20 +
    1.21 +	cd $src-pam
    1.22 +	./configure \
    1.23 +		--with-sys-screenrc=/etc/screenrc \
    1.24 +		--enable-pam \
    1.25 +		$CONFIGURE_ARGS &&
    1.26  	make &&
    1.27 -	make -j1 DESTDIR=$DESTDIR-pam install &&
    1.28 +	make -j1 DESTDIR=$DESTDIR-pam install || return 1
    1.29 +
    1.30  	for dir in $DESTDIR $DESTDIR-pam ; do
    1.31 -		mkdir -p $dir/usr/share/terminfo &&
    1.32 -		tic -o $dir/usr/share/terminfo terminfo/screeninfo.src &&
    1.33 -		mkdir -p $dir/etc &&
    1.34 +		mkdir -p $dir/usr/share/terminfo
    1.35 +		tic -o $dir/usr/share/terminfo terminfo/screeninfo.src
    1.36 +		mkdir -p $dir/etc
    1.37  		cp $src/etc/screenrc $dir/etc
    1.38  	done
    1.39  }
    1.40 @@ -42,9 +49,12 @@
    1.41  		CONFIG_FILES="/etc/screenrc"
    1.42  		SUGGESTED="screen-terminfo"
    1.43  		DEPENDS="elfutils"
    1.44 -		[ $PACKAGE == screen-pam] && DEPENDS="$DEPENDS pam" &&
    1.45 -			CAT="system-tools|with PAM support" &&
    1.46 -			PROVIDE="screen:pam" && install=$install-pam
    1.47 +		if [ $PACKAGE == 'screen-pam' ]; then
    1.48 +			DEPENDS="$DEPENDS pam"
    1.49 +			CAT="system-tools|with PAM support"
    1.50 +			PROVIDE="screen:pam"
    1.51 +			install=$install-pam
    1.52 +		fi
    1.53  		mkdir -p $fs/usr/bin $fs/usr/share
    1.54  		cp -a $install/etc $fs
    1.55  		cp -a $install/usr/bin/screen-$VERSION $fs/usr/bin/screen