# HG changeset patch # User Pascal Bellard # Date 1420709701 -3600 # Node ID d553e7773a211b7ce3bb8db3949d7be63203fb47 # Parent 5d53e8ccbc8d66ebc43a46df7ad66c765242f515 grep: fix busybox paths diff -r 5d53e8ccbc8d -r d553e7773a21 grep/receipt --- a/grep/receipt Thu Jan 08 02:04:05 2015 +0200 +++ b/grep/receipt Thu Jan 08 10:35:01 2015 +0100 @@ -37,11 +37,17 @@ root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/usr/bin/grep + for i in grep egrep fgrep ; do + rm -f $root$(busybox grep bin/$i$ \ + $root/var/lib/tazpkg/installed/busybox/files.list) + done status } post_remove() { - ln -s /bin/busybox $1/usr/bin/grep + for i in grep egrep fgrep ; do + ln -s /bin/busybox $root$(busybox grep bin/$i$ \ + $root/var/lib/tazpkg/installed/busybox/files.list) + done } diff -r 5d53e8ccbc8d -r d553e7773a21 ht/receipt --- a/ht/receipt Thu Jan 08 02:04:05 2015 +0200 +++ b/ht/receipt Thu Jan 08 10:35:01 2015 +0100 @@ -17,10 +17,10 @@ # Rules to configure and make the package. compile_rules() { - cd $src + export LDFLAGS="-Wl,--copy-dt-needed-entries" chmod +x install-sh ./configure --prefix=/usr --infodir=/usr/share/info \ - --mandir=/usr/share/man \ + --mandir=/usr/share/man \ $CONFIGURE_ARGS && make && make DESTDIR=$DESTDIR install @@ -31,4 +31,3 @@ { cp -a $install/usr $fs } -