git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [BUGLET] Makefile uses $(SCRIPT_PERL) but Documentation/Makefile uses "perl"
@ 2007-11-25 20:39 Randal L. Schwartz
  2007-12-01  2:36 ` [PATCH] Run the specified perl in Documentation/ Junio C Hamano
  0 siblings, 1 reply; 2+ messages in thread
From: Randal L. Schwartz @ 2007-11-25 20:39 UTC (permalink / raw)
  To: git


On my system, that means the two Makefiles actually use two different
Perl installations.  It'd be best if someone who is smarter at Makefiles
than I am would make them work the same.  Thanks.

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!

^ permalink raw reply	[flat|nested] 2+ messages in thread

* [PATCH] Run the specified perl in Documentation/
  2007-11-25 20:39 [BUGLET] Makefile uses $(SCRIPT_PERL) but Documentation/Makefile uses "perl" Randal L. Schwartz
@ 2007-12-01  2:36 ` Junio C Hamano
  0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2007-12-01  2:36 UTC (permalink / raw)
  To: Randal L. Schwartz; +Cc: git

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>
---

 * 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+
 

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-12-01  2:37 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-25 20:39 [BUGLET] Makefile uses $(SCRIPT_PERL) but Documentation/Makefile uses "perl" Randal L. Schwartz
2007-12-01  2:36 ` [PATCH] Run the specified perl in Documentation/ Junio C Hamano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).