Change 11502 by jhi@wayland on 2001/07/30 13:45:27
Doubly guard against invoking CPAN if no extras defined,
pointed out by H. Merijn Brand.
Affected files ...
... //depot/perl/Makefile.SH#206 edit
Differences ...
==== //depot/perl/Makefile.SH#206 (text) ====
Index: perl/Makefile.SH
--- perl/Makefile.SH.~1~ Mon Jul 30 08:00:05 2001
+++ perl/Makefile.SH Mon Jul 30 08:00:05 2001
@@ -667,20 +667,14 @@
-@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
End of Patch.
