From: Junio C Hamano Date: Sat, 01 Dec 2007 02:36:34 GMT Subject: [PATCH] Run the specified perl in Documentation/ Message-ID: <7vfxyn9m4t.fsf@gitster.siamese.dyndns.org> In-Reply-To: <863auuoy96.fsf@blue.stonehenge.com> 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 --- * Haven't tested this at all; please Ack or report breakage. Documentation/Makefile | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index d886641..8b19130 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 $(MAN1_TXT) $(RM) $@ - perl ./cmd-list.perl + $(PERL_PATH) ./cmd-list.perl 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+