summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-07-18 12:20:32 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-18 12:20:32 -0700
commit36b37afda6487113a981b036431fa97aa3fe2234 (patch)
tree67ee70a1db67a11fe7717bc67f2e2607847d52f1
parentMerge branch 'ao/config-from-gitmodules' (diff)
parentMakefile: tweak sed invocation (diff)
downloadtgif-36b37afda6487113a981b036431fa97aa3fe2234.tar.xz
Merge branch 'dj/runtime-prefix'
POSIX portability fix in Makefile to fix a glitch introduced a few releases ago. * dj/runtime-prefix: Makefile: tweak sed invocation
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 0cb6590f24..3b1effb4ca 100644
--- a/Makefile
+++ b/Makefile
@@ -2110,7 +2110,7 @@ $(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE
$(QUIET_GEN)$(RM) $@ $@+ && \
sed -e '1{' \
-e ' s|#!.*perl|#!$(PERL_PATH_SQ)|' \
- -e ' rGIT-PERL-HEADER' \
+ -e ' r GIT-PERL-HEADER' \
-e ' G' \
-e '}' \
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \