Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=15d945416d289c4aae9686010103e7e03ff8e08c
commit 15d945416d289c4aae9686010103e7e03ff8e08c Author: Michel Hermier <[email protected]> Date: Sat Mar 24 14:35:51 2012 +0100 util.sh * Use @DESTDIR@ in Fmakeinstall instead of $Fdestdir as test target. Use this fake target to avoid some false positives if Fmakeinstall use $Fdestdir. diff --git a/source/include/util.sh b/source/include/util.sh index 4efdbb6..e5b84eb 100644 --- a/source/include/util.sh +++ b/source/include/util.sh @@ -890,8 +890,8 @@ Fnant() { Fmakeinstall() { Fmessage "Installing to the package directory..." if [ -f GNUmakefile -o -f makefile -o -f Makefile ]; then - if make -p -q DESTDIR="$Fdestdir" "$@" install 2>/dev/null | grep -v 'DESTDIR\s*=' | \ - grep -q "$Fdestdir\\|\$DESTDIR\\|\$(DESTDIR)\\|\${DESTDIR}" 2>/dev/null; then + if make -p -q DESTDIR="@DESTDIR@" "$@" install 2>/dev/null | grep -v 'DESTDIR\s*=' | \ + grep -q "@DESTDIR@\\|\$DESTDIR\\|\$(DESTDIR)\\|\${DESTDIR}" 2>/dev/null; then _F_make_opts="$_F_make_opts DESTDIR=$Fdestdir" else _F_make_opts="$_F_make_opts prefix=$Fdestdir/$Fprefix" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
