summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-06-18 11:16:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-18 11:16:55 -0700
commitecdb3ec9846d06750a0d4b79884a763aa91daa40 (patch)
tree34f80f54d92b4ec0b76c3a17944d3428b46bb307 /Makefile
parentMerge branch 'ec/diff-noprefix-config' (diff)
parentMakefile: remove redundant munging of @@INSTLIBDIR@@ (diff)
downloadtgif-ecdb3ec9846d06750a0d4b79884a763aa91daa40.tar.xz
Merge branch 'ab/maint-perl-use-instlibdir'
* ab/maint-perl-use-instlibdir: Makefile: remove redundant munging of @@INSTLIBDIR@@
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 0a8dff3a1a..b979fb7492 100644
--- a/Makefile
+++ b/Makefile
@@ -1566,11 +1566,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 $@+ && \