wok-next rev 17502

grep: fix busybox paths
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Jan 08 10:35:01 2015 +0100 (2015-01-08)
parents 5d53e8ccbc8d
children 04239f2844c3
files grep/receipt ht/receipt
line diff
     1.1 --- a/grep/receipt	Thu Jan 08 02:04:05 2015 +0200
     1.2 +++ b/grep/receipt	Thu Jan 08 10:35:01 2015 +0100
     1.3 @@ -37,11 +37,17 @@
     1.4  	root=$1
     1.5  	echo "Processing pre-install commands..."
     1.6  	echo -n "Removing all Busybox replaced utils... "
     1.7 -	rm -f $root/usr/bin/grep
     1.8 +	for i in grep egrep fgrep ; do
     1.9 +		rm -f $root$(busybox grep bin/$i$ \
    1.10 +			$root/var/lib/tazpkg/installed/busybox/files.list)
    1.11 +	done
    1.12  	status
    1.13  }
    1.14  
    1.15  post_remove()
    1.16  {
    1.17 -	ln -s /bin/busybox $1/usr/bin/grep
    1.18 +	for i in grep egrep fgrep ; do
    1.19 +		ln -s /bin/busybox $root$(busybox grep bin/$i$ \
    1.20 +			$root/var/lib/tazpkg/installed/busybox/files.list)
    1.21 +	done
    1.22  }
     2.1 --- a/ht/receipt	Thu Jan 08 02:04:05 2015 +0200
     2.2 +++ b/ht/receipt	Thu Jan 08 10:35:01 2015 +0100
     2.3 @@ -17,10 +17,10 @@
     2.4  # Rules to configure and make the package.
     2.5  compile_rules()
     2.6  {
     2.7 -	cd $src
     2.8 +	export LDFLAGS="-Wl,--copy-dt-needed-entries"
     2.9  	chmod +x install-sh
    2.10  	./configure --prefix=/usr --infodir=/usr/share/info \
    2.11 -	--mandir=/usr/share/man \
    2.12 +		--mandir=/usr/share/man \
    2.13  	$CONFIGURE_ARGS &&
    2.14  	make &&
    2.15  	make DESTDIR=$DESTDIR install
    2.16 @@ -31,4 +31,3 @@
    2.17  {
    2.18  	cp -a $install/usr $fs
    2.19  }
    2.20 -