Run the specified perl in Documentation/

Makefile uses $(PERL_PATH) but Documentation/Makefile uses "perl"; that
means the two Makefiles can use two different Perl installations.

Teach Documentation/Makefile to use PERL_PATH that is exported from the
toplevel Makefile, and give a sane fallback for people who run "make"
from Documentation directory.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 16ee0d39724578b947dee8e1afee6c828e8ed591..1b5802456dea9dec329cba19eddb6ef6ea45a090 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -45,6 +45,9 @@ infodir?=$(prefix)/share/info
 MAKEINFO=makeinfo
 INSTALL_INFO=install-info
 DOCBOOK2X_TEXI=docbook2x-texi
 MAKEINFO=makeinfo
 INSTALL_INFO=install-info
 DOCBOOK2X_TEXI=docbook2x-texi

+ifndef PERL_PATH
+       PERL_PATH = /usr/bin/perl
+endif

 
 -include ../config.mak.autogen
 -include ../config.mak
 
 -include ../config.mak.autogen
 -include ../config.mak


@@ -105,7 +108,7 @@ install-info: info
 #
 doc.dep : $(wildcard *.txt) build-docdep.perl
        $(RM) $@+ $@
 #
 doc.dep : $(wildcard *.txt) build-docdep.perl
        $(RM) $@+ $@

-       perl ./build-docdep.perl >$@+
+       $(PERL_PATH) ./build-docdep.perl >$@+

        mv $@+ $@
 
 -include doc.dep
        mv $@+ $@
 
 -include doc.dep


@@ -124,7 +127,7 @@ $(cmds_txt): cmd-list.made
 
 cmd-list.made: cmd-list.perl ../command-list.txt $(MAN1_TXT)
        $(RM) $@
 
 cmd-list.made: cmd-list.perl ../command-list.txt $(MAN1_TXT)
        $(RM) $@

-       perl ./cmd-list.perl ../command-list.txt
+       $(PERL_PATH) ./cmd-list.perl ../command-list.txt

        date >$@
 
 git.7 git.html: git.txt
        date >$@
 
 git.7 git.html: git.txt


@@ -161,7 +164,7 @@ user-manual.html: user-manual.xml
 git.info: user-manual.xml
        $(RM) $@ $*.texi $*.texi+
        $(DOCBOOK2X_TEXI) user-manual.xml --to-stdout >$*.texi+
 git.info: user-manual.xml
        $(RM) $@ $*.texi $*.texi+
        $(DOCBOOK2X_TEXI) user-manual.xml --to-stdout >$*.texi+

-       perl fix-texi.perl <$*.texi+ >$*.texi
+       $(PERL_PATH) fix-texi.perl <$*.texi+ >$*.texi

        $(MAKEINFO) --no-split $*.texi
        $(RM) $*.texi $*.texi+
 
        $(MAKEINFO) --no-split $*.texi
        $(RM) $*.texi $*.texi+