Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=9205356085113dc56ed4cdc645ccc967cad745ff
commit 9205356085113dc56ed4cdc645ccc967cad745ff
Author: Michel Hermier <herm...@frugalware.org>
Date: Mon Jul 19 07:25:37 2010 +0200
util.sh
* Yet another fix to Fmakeinstall. I forgot that specifying
"DESTDIR=foo" will populate the make rule database. Lets grep -v the
database output to remove DESTDIR assignations rules and add search for
DESTDIR usage in rules.
diff --git a/source/include/util.sh b/source/include/util.sh
index bb866b5..4eebcf8 100644
--- a/source/include/util.sh
+++ b/source/include/util.sh
@@ -744,7 +744,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" 2>/dev/null | grep -q
"$Fdestdir" 2>/dev/null; then
+ if make -p -q DESTDIR="$Fdestdir" 2>/dev/null | grep -v
'DESTDIR\s*=' | \
+ grep -q
"$Fdestdir\\|\$DESTDIR\\|\$(DESTDIR)\\|\${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
