summaryrefslogtreecommitdiff
path: root/Documentation/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-01 02:36:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-04 07:48:09 (GMT)
commitc680dd8341c2aa429acfc13223220d72b8d2c5c9 (patch)
treec1892d92b7e4142a4a371ddced1ad124067aa2eb /Documentation/Makefile
parentafc67036de4c6f27234243dded05d7dd9398eea5 (diff)
downloadgit-c680dd8341c2aa429acfc13223220d72b8d2c5c9.zip
git-c680dd8341c2aa429acfc13223220d72b8d2c5c9.tar.gz
git-c680dd8341c2aa429acfc13223220d72b8d2c5c9.tar.bz2
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>
Diffstat (limited to 'Documentation/Makefile')
-rw-r--r--Documentation/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 16ee0d3..1b58024 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -45,6 +45,9 @@ infodir?=$(prefix)/share/info
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
@@ -105,7 +108,7 @@ install-info: info
#
doc.dep : $(wildcard *.txt) build-docdep.perl
$(RM) $@+ $@
- perl ./build-docdep.perl >$@+
+ $(PERL_PATH) ./build-docdep.perl >$@+
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) $@
- perl ./cmd-list.perl ../command-list.txt
+ $(PERL_PATH) ./cmd-list.perl ../command-list.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+
- perl fix-texi.perl <$*.texi+ >$*.texi
+ $(PERL_PATH) fix-texi.perl <$*.texi+ >$*.texi
$(MAKEINFO) --no-split $*.texi
$(RM) $*.texi $*.texi+