Re: [PATCH v4 1/4] Makefile: generate Perl header from template file
- From
Johannes Sixt <j6t@kdbg.org>
- Date
- Dec 6, 2017, 18:25 UTC
- Message-ID
- <e0a22ee4-9503-760f-293c-be56fa46fa04@kdbg.org>
- In-Reply-To
- <xmqq7eu0j1th.fsf@gitster.mtv.corp.google.com>
Am 05.12.2017 um 22:35 schrieb Junio C Hamano:
Show 13 quoted lines
> Dan Jacques <dnj@google.com> writes: > >> Thanks for checking! The patch that you quoted above looks like it's from >> this "v4" thread; however, the patch that you are diffing against in your >> latest reply seems like it is from an earlier version. >> >> I believe that the $(pathsep) changes in your proposed patch are already >> present in v4,... > > You're of course right. The patches I had in my tree are outdated. > > Will replace, even though I won't be merging them to 'pu' while we > wait for Ævar's perl build procedure update to stabilize.
The updated series works for me now. Nevertheless, I suggest to squash in the following change to protect against IFS and globbing characters in $INSTLIBDIR.
diff --git a/Makefile b/Makefile index 7ac4458f11..08c78a1a63 100644 --- a/Makefile +++ b/Makefile @@ -2072,7 +2072,7 @@ GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) GIT-PERL-DEFINES perl/perl.mak Makefile INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \ INSTLIBDIR="$$INSTLIBDIR$${INSTLIBDIR_EXTRA:+:$$INSTLIBDIR_EXTRA}" && \ sed -e 's=@@PATHSEP@@=$(pathsep)=g' \ - -e 's=@@INSTLIBDIR@@='$$INSTLIBDIR'=g' \ + -e 's=@@INSTLIBDIR@@='"$$INSTLIBDIR"'=g' \ -e 's=@@GITEXECDIR@@=$(gitexecdir_relative_SQ)=g' \ -e 's=@@PERLLIBDIR@@=$(perllibdir_relative_SQ)=g' \ $< >$@+ && \