From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Jul 2018 19:20:32 +0000 (-0700)
Subject: Merge branch 'dj/runtime-prefix'
X-Git-Tag: v2.19.0-rc0~153
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/36b37afda6487113a981b036431fa97aa3fe2234?hp=b9632c9d95f601c3d557cdbad60c06fcc7d30110

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
---

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' \