diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2001-07-30 13:45:27 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2001-07-30 13:45:27 +0000 |
| commit | 1ed14a8d6da4a465f77758f496115998d39044b3 (patch) | |
| tree | 078e7d6f97382281337e5ce5f70a0c126979c38f /Makefile.SH | |
| parent | a4a1abb9d8f354abaa94423970736fc8d4eeec04 (diff) | |
| download | perl-1ed14a8d6da4a465f77758f496115998d39044b3.tar.gz | |
Doubly guard against invoking CPAN if no extras defined,
pointed out by H. Merijn Brand.
p4raw-id: //depot/perl@11502
Diffstat (limited to 'Makefile.SH')
| -rw-r--r-- | Makefile.SH | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/Makefile.SH b/Makefile.SH index 9262cf82c1..2de7fe6c21 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 |