summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-06 23:43:42 -0800
committerJunio C Hamano <gitster@pobox.com>2007-12-06 23:43:42 -0800
commit9539a56e23d29655ed0388fe6ad148139f771265 (patch)
tree21a41aa558b5ca0fe297d66284eee677a33f87c8 /Documentation
parenta43aa4cec8a0439176121567a91d23c3dfec861c (diff)
parentc680dd8341c2aa429acfc13223220d72b8d2c5c9 (diff)
downloadgit-9539a56e23d29655ed0388fe6ad148139f771265.tar.gz
Merge branch 'jc/docmake-perl'
* jc/docmake-perl: Run the specified perl in Documentation/
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 16ee0d3972..1b5802456d 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+