[RFC/PATCH v2] gitweb: respect $GITPERLLIB
From: Lea Wiemann <hidden>
Date: 2016-06-15 22:44:48
Subsystem:
kernel build + files below scripts/ (unless maintained elsewhere), the rest · Maintainers:
Nathan Chancellor, Nicolas Schier, Linus Torvalds
gitweb/gitweb.cgi now respects $GITPERLLIB, like the Perl-based Git commands. Signed-off-by: Lea Wiemann <redacted> --- Changed since v1: Added missing INSTLIBDIR initialization. I just noticed that as of now Gitweb isn't using any Perl modules, so this change is actually not necessary yet; hence I'm making it an RFC patch. I'll probably squash this into a larger "gitweb: use new Git::Repo API" patch (which I'll publish in a few days). Comments on this change to the Makefile are still appreciated, of course. :) -- Lea Makefile | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 85c0846..64eeac1 100644
--- a/Makefile
+++ b/Makefile@@ -1083,7 +1083,15 @@ $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl gitweb/gitweb.cgi: gitweb/gitweb.perl $(QUIET_GEN)$(RM) $@ $@+ && \ - sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \ + INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \ + sed -e '1{' \ + -e ' s|#!.*perl|#!$(PERL_PATH_SQ)|' \ + -e ' h' \ + -e ' s=.*=use lib (split(/:/, $$ENV{GITPERLLIB} || "@@INSTLIBDIR@@"));=' \ + -e ' H' \ + -e ' x' \ + -e '}' \ + -e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \ -e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \ -e 's|++GIT_BINDIR++|$(bindir)|g' \ -e 's|++GITWEB_CONFIG++|$(GITWEB_CONFIG)|g' \
--
1.5.6.79.g01e9.dirty