aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-29 17:02:21 -0700
committerJunio C Hamano <junkio@cox.net>2006-07-02 17:14:43 -0700
commit893973a6f271429fbe1973d61dc8e1d76753327e (patch)
treec0829aa1fce6e6d6e4c254d7b946501eb70c8b35
parentc35ebc902fd5c48c978d0d4cfab52ccdb4b11f54 (diff)
downloadgit-893973a6f271429fbe1973d61dc8e1d76753327e.tar.gz
git-893973a6f271429fbe1973d61dc8e1d76753327e.tar.xz
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>
-rw-r--r--Makefile2
-rw-r--r--perl/Makefile.PL2
2 files changed, 2 insertions, 2 deletions
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
}