From: Junio C Hamano <junkio@cox.net>
Date: Fri, 30 Jun 2006 00:02:21 +0000 (-0700)
Subject: Perly git: work around buggy make implementations.
X-Git-Tag: v1.4.3-rc1~2^2~28
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=893973a6f271429fbe1973d61dc8e1d76753327e;p=git.git

Perly git: work around buggy make implementations.

FC4 uses gnumake 3.80 whose annoying "Entering directory..."
messages are not silenced with -s alone.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Makefile b/Makefile
index 3c25fb38b..3810514d5 100644
--- a/Makefile
+++ b/Makefile
@@ -549,7 +549,7 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
 $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/Makefile
 $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
 	rm -f $@ $@+
-	INSTLIBDIR=`make -s -C perl instlibdir` && \
+	INSTLIBDIR=`$(MAKE) -C perl -s --no-print-directory instlibdir` && \
 	sed -e '1s|#!.*perl\(.*\)|#!$(PERL_PATH_SQ)\1|' \
 	    -e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
 	    -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index 92c140d39..d401a6609 100644
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -3,7 +3,7 @@ use ExtUtils::MakeMaker;
 sub MY::postamble {
 	return <<'MAKE_FRAG';
 instlibdir:
-	@echo $(INSTALLSITEARCH)
+	@echo '$(INSTALLSITEARCH)'
 
 MAKE_FRAG
 }