Re: [PATCH 1/2] Makefile: remove unused @@PERLLIBDIR@@ substitution variable

[Junio C Hamano]

Jonathan Nieder  writes:

> Junio noticed that this variable is not quoted correctly when it is
> passed to sed.  As a shell-quoted string, it should be inside
> single-quotes like $(perllibdir_relative_SQ), not outside them like
> $INSTLIBDIR.

Spreading credit is very much appreciated, but in this case the
above belongs below the three-dash fold, I would think, as the
incorrect quoting become irrelevant.

Will queue.  Thanks.

> In fact, this substitution variable is not used.  Simplify by removing
> it.
>
> Reported-by: Junio C Hamano 
> Signed-off-by: Jonathan Nieder 
> ---
> An unrelated cleanup noticed while looking over this code.
>
>  Makefile | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index 154929f1c8..8f4cb506ff 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -2109,7 +2109,6 @@ GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) 
> GIT-PERL-DEFINES Makefile
>   INSTLIBDIR="$$INSTLIBDIR$${INSTLIBDIR_EXTRA:+:$$INSTLIBDIR_EXTRA}" && \
>   sed -e 's=@@PATHSEP@@=$(pathsep)=g' \
>   -e 's=@@INSTLIBDIR@@='$$INSTLIBDIR'=g' \
> - -e 's=@@PERLLIBDIR@@='$(perllibdir_SQ)'=g' \
>   -e 's=@@PERLLIBDIR_REL@@=$(perllibdir_relative_SQ)=g' \
>   -e 's=@@GITEXECDIR_REL@@=$(gitexecdir_relative_SQ)=g' \
>   -e 's=@@LOCALEDIR_REL@@=$(localedir_relative_SQ)=g' \

[PATCH 1/2] Makefile: remove unused @@PERLLIBDIR@@ substitution variable

[Jonathan Nieder]

Junio noticed that this variable is not quoted correctly when it is
passed to sed.  As a shell-quoted string, it should be inside
single-quotes like $(perllibdir_relative_SQ), not outside them like
$INSTLIBDIR.

In fact, this substitution variable is not used.  Simplify by removing
it.

Reported-by: Junio C Hamano 
Signed-off-by: Jonathan Nieder 
---
An unrelated cleanup noticed while looking over this code.

 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index 154929f1c8..8f4cb506ff 100644
--- a/Makefile
+++ b/Makefile
@@ -2109,7 +2109,6 @@ GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) GIT-PERL-DEFINES 
Makefile
INSTLIBDIR="$$INSTLIBDIR$${INSTLIBDIR_EXTRA:+:$$INSTLIBDIR_EXTRA}" && \
sed -e 's=@@PATHSEP@@=$(pathsep)=g' \
-e 's=@@INSTLIBDIR@@='$$INSTLIBDIR'=g' \
-   -e 's=@@PERLLIBDIR@@='$(perllibdir_SQ)'=g' \
-e 's=@@PERLLIBDIR_REL@@=$(perllibdir_relative_SQ)=g' \
-e 's=@@GITEXECDIR_REL@@=$(gitexecdir_relative_SQ)=g' \
-e 's=@@LOCALEDIR_REL@@=$(localedir_relative_SQ)=g' \
-- 
2.17.0.441.gb46fe60e1d