Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5c36da74f7527a1fc1e39269bcf526c712a126c8
commit 5c36da74f7527a1fc1e39269bcf526c712a126c8 Author: Miklos Vajna <[email protected]> Date: Thu Jul 15 10:09:13 2010 +0200 Fmakeinstall: grep for ${DESTDIR} as well diff --git a/source/include/util.sh b/source/include/util.sh index 48dfc8c..0bc6ee7 100644 --- a/source/include/util.sh +++ b/source/include/util.sh @@ -744,7 +744,7 @@ Fnant() { Fmakeinstall() { Fmessage "Installing to the package directory..." if [ -f GNUmakefile -o -f makefile -o -f Makefile ]; then - if make -p -q 2>/dev/null | grep -q '$(DESTDIR)' 2>/dev/null; then + if make -p -q 2>/dev/null | grep -q '$\((\|{\)DESTDIR\()\|}\)' 2>/dev/null; then Fexec make DESTDIR="$Fdestdir" "$@" install || Fdie else Fexec make prefix="$Fdestdir"/"$Fprefix" "$@" install || Fdie _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
