diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-07-18 12:20:32 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-07-18 12:20:32 -0700 |
commit | 36b37afda6487113a981b036431fa97aa3fe2234 (patch) | |
tree | 67ee70a1db67a11fe7717bc67f2e2607847d52f1 | |
parent | Merge branch 'ao/config-from-gitmodules' (diff) | |
parent | Makefile: tweak sed invocation (diff) | |
download | tgif-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-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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' \ |