summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-09-25 00:30:33 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-09-25 00:30:33 -0700
commit41ef95aea7c8d8a337af693b601511e099cc468f (patch)
tree7c108f9cd0a30983f3397491763c85507e0b2875 /Makefile
parentStart RelNotes for 1.5.4 (diff)
parentDo not over-quote the -f envelopesender value. (diff)
downloadtgif-41ef95aea7c8d8a337af693b601511e099cc468f.tar.xz
Merge branch 'maint'
* maint: Do not over-quote the -f envelopesender value. unexpected Make output (e.g. from --debug) causes build failure Fixed minor typo in t/t9001-send-email.sh test command line.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 0055eef24d..97ce687606 100644
--- a/Makefile
+++ b/Makefile
@@ -805,7 +805,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' \