diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-18 18:16:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-18 18:16:55 (GMT) |
| commit | ecdb3ec9846d06750a0d4b79884a763aa91daa40 (patch) | |
| tree | 34f80f54d92b4ec0b76c3a17944d3428b46bb307 /Makefile | |
| parent | 2621ac50cc2c7bb236f7f4abf8bbbb7f30168ff6 (diff) | |
| parent | a6c6060a0ac04150403b7be420f962c167c27565 (diff) | |
| download | git-ecdb3ec9846d06750a0d4b79884a763aa91daa40.zip git-ecdb3ec9846d06750a0d4b79884a763aa91daa40.tar.gz git-ecdb3ec9846d06750a0d4b79884a763aa91daa40.tar.bz2 | |
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-- | Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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 $@+ && \ |