Merge branch 'ab/maint-perl-use-instlibdir'

* ab/maint-perl-use-instlibdir: Makefile: remove redundant munging of @@INSTLIBDIR@@
git-mirror · Jun 18, 2010 · ecdb3ec · ecdb3ec
2 parents 2621ac5 + a6c6060
commit ecdb3ec
Showing 1 changed file with 1 addition and 2 deletions.
diff --git 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 $@+ && \