Makefile: add PERLLIB_EXTRA variable that adds to default perl path
Some platforms ship Perl modules used by git scripts outside the default perl path (e.g., on Mac OS X, Subversion's perl bindings live in a separate xcode perl path). Add an PERLLIB_EXTRA variable to hold a colon-separated list of extra directories to add to the perl path in git's scripts, as a convenience for packagers. Requested-by: Dave Borowitz <dborowitz@google.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder committed
Nov 15, 2013 at 13:10 UTC
0386dd37b1999ec9d531583f5b77eec0245de3a7
1 file changed
+4
-1
Makefile
+4
-1
@@ -1588,6 +1588,7 @@ PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
1588
PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
1589
TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
1590
DIFF_SQ = $(subst ','\'',$(DIFF))
1591
+PERLLIB_EXTRA_SQ = $(subst ','\'',$(PERLLIB_EXTRA))
1592
1593
LIBS = $(GITLIBS) $(EXTLIBS)
1594
@@ -1792,10 +1793,12 @@ perl/PM.stamp: FORCE
1793
perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
1794
$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
1795
1795
-PERL_DEFINES = $(PERL_PATH_SQ)
1796
+PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ)
1797
$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE
1798
$(QUIET_GEN)$(RM) $@ $@+ && \
1799
INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
1800
+ INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \
1801
+ INSTLIBDIR="$$INSTLIBDIR$${INSTLIBDIR_EXTRA:+:$$INSTLIBDIR_EXTRA}" && \
1802
sed -e '1{' \
1803
-e ' s|#!.*perl|#!$(PERL_PATH_SQ)|' \
1804
-e ' h' \