summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2010-05-30 17:12:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-01 00:47:36 (GMT)
commita6c6060a0ac04150403b7be420f962c167c27565 (patch)
treede20fd750e751370bf33ea8f3d0517fa7316215e /Makefile
parent371276bf29314af04b804cfd877abcac62674a58 (diff)
downloadgit-a6c6060a0ac04150403b7be420f962c167c27565.zip
git-a6c6060a0ac04150403b7be420f962c167c27565.tar.gz
git-a6c6060a0ac04150403b7be420f962c167c27565.tar.bz2
Makefile: remove redundant munging of @@INSTLIBDIR@@
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 61ad668..0c7c5d1 100644
--- a/Makefile
+++ b/Makefile
@@ -1545,11 +1545,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 $@+ && \