Use $GITPERLLIB instead of $RUNNING_GIT_TESTS and centralize @INC munging

diff --git a/Makefile b/Makefile
index 703016725358c7122a211261eca946f17b31452f..71657ec90466766ed1035eea2e49b2ca05fd86dd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -550,7 +550,9 @@ $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/Makefile
 $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
        rm -f $@ $@+
        INSTLIBDIR=`$(MAKE) -C perl -s --no-print-directory instlibdir` && \
-       sed -e '1s|#!.*perl\(.*\)|#!$(PERL_PATH_SQ)\1|' \
+       sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|1' \
+           -e '2i\
+               use lib (split(/:/, $$ENV{GITPERLLIB} || '\'"$$INSTLIBDIR"\''));' \
            -e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
            -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
            $@.perl >$@+