From: "Alejandro R. Sedeño" <asedeno@mit.edu>
To: git@vger.kernel.org
Cc: "Dan Jacques" <dnj@google.com>, "Alejandro R. Sedeño" <asedeno@mit.edu>
Subject: [PATCH] Makefile: tweak sed invocation
Date: Mon, 25 Jun 2018 15:13:25 -0400 [thread overview]
Message-ID: <1529954005-18189-1-git-send-email-asedeno@mit.edu> (raw)
With GNU sed, the r command doesn't care if a space separates it and
the filename it reads from.
With SunOS sed, the space is required.
Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index e4b503d..5bac181 100644
--- a/Makefile
+++ b/Makefile
@@ -2109,7 +2109,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' \
--
2.1.4
next reply other threads:[~2018-06-25 19:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-25 19:13 Alejandro R. Sedeño [this message]
2018-06-25 20:15 ` [PATCH] Makefile: tweak sed invocation Eric Sunshine
2018-06-25 20:27 ` Alejandro R. Sedeño
[not found] ` <xmqqefgtl7kq.fsf@gitster-ct.c.googlers.com>
2018-07-02 23:12 ` Alejandro R. Sedeño
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1529954005-18189-1-git-send-email-asedeno@mit.edu \
--to=asedeno@mit.edu \
--cc=dnj@google.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).