Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=a317678e84b75cb744ff5ad3bd7b21b8346fb03e

commit a317678e84b75cb744ff5ad3bd7b21b8346fb03e
Author: Michel Hermier <herm...@frugalware.org>
Date:   Wed Jul 7 14:56:41 2010 +0200

util.sh

* Fmakeinstall: detect the DESTDIR variable presence in Makefiles by
dumping the makedatabase. Should be a quite more slower, but much more
reliable.

diff --git a/source/include/util.sh b/source/include/util.sh
index e2f0ca8..68ed1f1 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 grep -q DESTDIR GNUmakefile makefile Makefile 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
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to