Web lists-archives.com

Re: [PATCH v4 1/4] Makefile: generate Perl header from template file




Johannes Sixt <j6t@xxxxxxxx> writes:

> 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.

Of course ;-)

Somehow I was lucky that the topic as been de-queued from 'pu' for
the past few days.

> 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