Re: [PATCH v4 1/4] Makefile: generate Perl header from template file
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Dec 6, 2017, 19:01 UTC
- Message-ID
- <CACBZZX4JKhprF-3L3===XOBJ3Gp7W2xbeJshZFAmnjwevs0JoQ@mail.gmail.com>
- In-Reply-To
- <CAD1RUU8BO7J=rV6XgLZ0xN-ikLsanwqHVBnRE9468xVE5EEMvA@mail.gmail.com>
On Wed, Dec 6, 2017 at 7:56 PM, Daniel Jacques <dnj@google.com> wrote:
Show 28 quoted lines
> On Wed, Dec 6, 2017 at 1:47 PM, Junio C Hamano <gitster@pobox.com> wrote:
>>
>> Johannes Sixt <j6t@kdbg.org> writes:
>>
>> > 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.
>>
>> Yeah, that is very sensible.
>>
>> > 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' \
>> > $< >$@+ && \
>
> Sounds good; I'll apply that to my working patch and include it in my
> next ("v5") submission, which is currently blocked pending avarab@'s Perl
> Makefile changes:
> https://public-inbox.org/git/20171129195430.10069-1-avarab@gmail.com/T/#tThanks, FWIW I'll send another version of that at the end of the week or so, I'm waiting to see if there's any more comments on it to reduce list churn.