Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=586aca201fdf6df61270d0d257d113f2bd053b71

commit 586aca201fdf6df61270d0d257d113f2bd053b71
Author: Michel Hermier <herm...@frugalware.org>
Date:   Tue Jul 20 18:50:25 2010 +0200

util.sh

* Dumping the make database with the same install argument might help to
detect DESTDIR usage.

diff --git a/source/include/util.sh b/source/include/util.sh
index 4eebcf8..84e8bf4 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 DESTDIR="$Fdestdir" 2>/dev/null | grep -v 
'DESTDIR\s*=' | \
+               if make -p -q DESTDIR="$Fdestdir" "$@" install 2>/dev/null | 
grep -v 'DESTDIR\s*=' | \
grep -q "$Fdestdir\\|\$DESTDIR\\|\$(DESTDIR)\\|\${DESTDIR}" 2>/dev/null; then
Fexec make DESTDIR="$Fdestdir" "$@" install || Fdie
else
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to