From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Mon, 30 Jul 2001 13:45:27 +0000 (+0000)
Subject: Doubly guard against invoking CPAN if no extras defined,
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a40613e1fa44a8ed3c85825f5c5523f641e43606;p=p5sagit%2Fp5-mst-13.2.git

Doubly guard against invoking CPAN if no extras defined,
pointed out by H. Merijn Brand.

p4raw-id: //depot/perl@11502
---

diff --git a/Makefile.SH b/Makefile.SH
index 9262cf8..2de7fe6 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -667,20 +667,14 @@ extra.pods: miniperl
 	-@rm -f pod/perlvms.pod
 	-@test -f vms/perlvms.pod && cd pod && $(LNS) ../vms/perlvms.pod perlvms.pod && cd .. && echo "pod/perlvms.pod" >> extra.pods
 
-extras.prep: perl
-	@echo "CPAN needs to be configured..."
-	@echo
-	-@test -f extras.lst || touch extras.lst
+extras.make: perl
+	-@test -s extras.lst && $(LDLIBPTH) PATH=`pwd`:${PATH} PERL5LIB=`pwd`/lib ./perl -Ilib -MCPAN -e '@ARGV&&make(@ARGV)' `cat extras.lst`
 
-extras.make: extras.prep
-	$(LDLIBPTH) PATH=`pwd`:${PATH} PERL5LIB=`pwd`/lib ./perl -Ilib -MCPAN -e 'make(@ARGV)' `cat extras.lst`
+extras.test: perl
+	-@test -s extras.lst && $(LDLIBPTH) PATH=`pwd`:${PATH} PERL5LIB=`pwd`/lib ./perl -Ilib -MCPAN -e '@ARGV&&test(@ARGV)' `cat extras.lst`
 
-extras.test: extras.prep
-	$(LDLIBPTH) PATH=`pwd`:${PATH} PERL5LIB=`pwd`/lib ./perl -Ilib -MCPAN -e 'test(@ARGV)' `cat extras.lst`
-
-extras.install: extras.prep
-	-@test -f extras.lst || touch extras.lst
-	$(LDLIBPTH) PATH=`pwd`:${PATH} PERL5LIB=`pwd`/lib ./perl -Ilib -MCPAN -e 'install(@ARGV)' `cat extras.lst`
+extras.install: perl
+	-@test -s extras.lst && $(LDLIBPTH) PATH=`pwd`:${PATH} PERL5LIB=`pwd`/lib ./perl -Ilib -MCPAN -e '@ARGV&&install(@ARGV)' `cat extras.lst`
 
 .PHONY: install install-strip install-all install-verbose install-silent \
 	no-install install.perl install.man installman install.html installhtml