Skip to content

Commit a6c6060

Browse files
avargitster
authored andcommitted
Makefile: remove redundant munging of @@INSTLIBDIR@@
Junio originally added this in f6276fe for use in `unshift @inc, '@@INSTLIBDIR@@'' in git-fmt-merge-msg.perl. That program was since then rewritten in C in 00449f9. And since 6fcca93 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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 371276b commit a6c6060

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1545,11 +1545,10 @@ $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
15451545
sed -e '1{' \
15461546
-e ' s|#!.*perl|#!$(PERL_PATH_SQ)|' \
15471547
-e ' h' \
1548-
-e ' s=.*=use lib (split(/$(pathsep)/, $$ENV{GITPERLLIB} || "@@INSTLIBDIR@@"));=' \
1548+
-e ' s=.*=use lib (split(/$(pathsep)/, $$ENV{GITPERLLIB} || "'"$$INSTLIBDIR"'"));=' \
15491549
-e ' H' \
15501550
-e ' x' \
15511551
-e '}' \
1552-
-e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
15531552
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
15541553
$@.perl >$@+ && \
15551554
chmod +x $@+ && \

0 commit comments

Comments
 (0)