From: Jim Meyering <jim@meyering.net>
Date: Tue, 25 Sep 2007 06:42:16 +0000 (+0200)
Subject: unexpected Make output (e.g. from --debug) causes build failure
X-Git-Tag: v1.5.3.3~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e883932f7dc83ea69a990cba656464d5315f3300;hp=85d81a757e495fe74d8a403f813d3748e832c112;p=git.git

unexpected Make output (e.g. from --debug) causes build failure

Without this, the extra output produced e.g., by "make --debug"
would go into $INSTLIBDIR and then cause the sed command to fail.

Signed-off-by: Jim Meyering <jim@meyering.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Makefile b/Makefile
index dace2112f..42ba1d0fa 100644
--- a/Makefile
+++ b/Makefile
@@ -783,7 +783,7 @@ perl/perl.mak: GIT-CFLAGS
 
 $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
 	$(QUIET_GEN)$(RM) $@ $@+ && \
-	INSTLIBDIR=`$(MAKE) -C perl -s --no-print-directory instlibdir` && \
+	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
 	sed -e '1{' \
 	    -e '	s|#!.*perl|#!$(PERL_PATH_SQ)|' \
 	    -e '	h' \