threads / patch / 23948

patchMakefile: remove redundant munging of @@INSTLIBDIR@@

Subject: [PATCH] Makefile: remove redundant munging of @@INSTLIBDIR@@

## tl;dr

One message between May 30, 2010 and May 30, 2010. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Ævar Arnfjörð Bjarmason· May 30, 2010, 17:12 UTC · lore

Junio originally added this in f6276fe159 for use in `unshift @INC, '@@INSTLIBDIR@@'' in git-fmt-merge-msg.perl. That program was since then rewritten in C in 00449f992b. And since 6fcca938b0 all Perl programs use `use lib' to set their @INC path.

There's been no @@INSTLIBDIR@@ in any Perl script to replace since then. So there's no reason to keep it around.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---

I saw this when doing Perl/Gettext support. @@INSTLIBDIR@@ hasn't been used for anything but the 'use lib' line there since mid-2006.

 Makefile |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
Show changes to Makefile +1 −2
diff --git a/Makefile b/Makefile
index d5d6565..64e30db 100644
--- a/Makefile
+++ b/Makefile
@@ -1562,11 +1562,10 @@ $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
 	sed -e '1{' \
 	    -e '	s|#!.*perl|#!$(PERL_PATH_SQ)|' \
 	    -e '	h' \
-	    -e '	s=.*=use lib (split(/$(pathsep)/, $$ENV{GITPERLLIB} || "@@INSTLIBDIR@@"));=' \
+	    -e '	s=.*=use lib (split(/$(pathsep)/, $$ENV{GITPERLLIB} || "'"$$INSTLIBDIR"'"));=' \
 	    -e '	H' \
 	    -e '	x' \
 	    -e '}' \
-	    -e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
 	    -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
 	    $@.perl >$@+ && \
 	chmod +x $@+ && \
-- 
1.7.1.237.gf48e9

← back to recent threads