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 3c25fb38bfcffb484938ece36c0924a42e3e1698..3810514d501610714c430eeabd3662c53d218654 100644 (file)
--- 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 92c140d39b662c10204cf54bcd906793b2a1279b..d401a6609bb552627dc3d85c53018d8941420687 100644 (file)
--- 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
 }