Hi,
Johannes Sixt wrote:
> Am 05.12.2017 um 22:35 schrieb Junio C Hamano:
> > Dan Jacques <d...@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' \
I just ran into this. Here's a pair of patches to fix it.
Thanks,
Jonathan Nieder (2):
Makefile: remove unused substitution variable @@PERLLIBDIR@@
Makefile: quote $INSTLIBDIR when passing it to sed
Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--
2.17.0.441.gb46fe60e1d
