Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=938bac75662558e54c475b2f197494a1c5a6b296
commit 938bac75662558e54c475b2f197494a1c5a6b296 Author: Michel Hermier <[email protected]> Date: Sat Mar 24 14:42:53 2012 +0100 util.sh * Replace @DESTDIR@ with @FDESTDIR@ to avoid potential problems with autotools substitutions (if any). diff --git a/source/include/util.sh b/source/include/util.sh index e5b84eb..fa592ba 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="@DESTDIR@" "$@" install 2>/dev/null | grep -v 'DESTDIR\s*=' | \ - grep -q "@DESTDIR@\\|\$DESTDIR\\|\$(DESTDIR)\\|\${DESTDIR}" 2>/dev/null; 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 _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
