Re: [PATCH v4 1/4] Makefile: generate Perl header from template file
- From
Johannes Sixt <j6t@kdbg.org>
- Date
- Dec 5, 2017, 20:54 UTC
- Message-ID
- <f0ad1ad4-67d8-21e2-fdd0-0a08328c1eaa@kdbg.org>
- In-Reply-To
- <97acc3d3-5c6a-2e65-a372-24def5b21d54@kdbg.org>
Am 01.12.2017 um 18:25 schrieb Johannes Sixt:
Show 31 quoted lines
> Am 01.12.2017 um 18:13 schrieb Johannes Schindelin:
>> Hi Hannes,
>>
>> On Fri, 1 Dec 2017, Johannes Sixt wrote:
>>
>>> Am 29.11.2017 um 16:56 schrieb Dan Jacques:
>>>> @@ -1989,6 +1986,15 @@ GIT-PERL-DEFINES: FORCE
>>>> echo "$$FLAGS" >$@; \
>>>> fi
>>>> +GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) GIT-PERL-DEFINES
>>>> perl/perl.mak
>>>> Makefile
>>>> + $(QUIET_GEN)$(RM) $@ && \
>>>> + INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory
>>>> instlibdir` && \
>>>> + INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \
>>>> +
>>>> INSTLIBDIR="$$INSTLIBDIR$${INSTLIBDIR_EXTRA:+:$$INSTLIBDIR_EXTRA}" &&
>>>> \
>>>> + sed -e 's=@@PATHSEP@@=$(pathsep)=g' \
>>>
>>> This doesn't work, unfortunately. When $(pathsep) is ';', we get an
>>> incomplete
>>> sed expression because ';' is also a command separator in the sed
>>> language.
>>
>> Funny, I tried this also with ';' as pathsep, and it worked in the Git
>> for
>> Windows SDK...
>
> My ancient sed vs. your modern sed, perhaps? I can check this on Monday.I don't know what I tested last week; most likely not the version of the patch I quoted above.
Today's version, with the tip at 5d7f59c391ce, is definitely bogus with its quoting. It needs the patch below, otherwise an unquoted semicolon may be expanded from $(pathsep). This would terminate the sed command, of course.
diff --git a/Makefile b/Makefile index 484dc44ade..a658c8169a 100644 --- a/Makefile +++ b/Makefile @@ -2071,10 +2071,10 @@ GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) GIT-PERL-DEFINES perl/perl.mak INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \ INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \ INSTLIBDIR="$$INSTLIBDIR$${INSTLIBDIR_EXTRA:+:$$INSTLIBDIR_EXTRA}" && \ - sed -e 's=@@PATHSEP@@='$(pathsep)'=g' \ - -e 's=@@INSTLIBDIR@@='$$INSTLIBDIR'=g' \ - -e 's=@@GITEXECDIR@@='$(gitexecdir_relative_SQ)'=g' \ - -e 's=@@PERLLIBDIR@@='$(perllibdir_relative_SQ)'=g' \ + sed -e 's=@@PATHSEP@@=$(pathsep)=g' \ + -e 's=@@INSTLIBDIR@@='"$$INSTLIBDIR"'=g' \ + -e 's=@@GITEXECDIR@@=$(gitexecdir_relative_SQ)=g' \ + -e 's=@@PERLLIBDIR@@=$(perllibdir_relative_SQ)=g' \ $< >$@ .PHONY: gitweb
-- 2.14.2.808.g3bc32f2729