diff options
| author | Nicholas Clark <nick@ccl4.org> | 2012-04-25 22:00:09 +0200 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2013-07-13 12:32:14 +0200 |
| commit | 3a03112500788fd8a2bf6c86b751b38a450b0e47 (patch) | |
| tree | b0dfd6c6d32513ef30810c14377c9dd05ae09542 /Makefile.SH | |
| parent | d618fe714273452c0536fde1f0be7eaa1e7241d3 (diff) | |
| download | perl-3a03112500788fd8a2bf6c86b751b38a450b0e47.tar.gz | |
Don't call CPAN to install any "extra" modules for the install-notify target.
Previously the Makefile's install-notify target built extra.install just like
the other 5 install targets. However, the other 5 actually install perl,
whereas install-notify (a.k.a. no-install) runs installperl and installman
with the --notify option (formerly -n), to cause them to print what they would
do but take no action. Hence if -Dextras was used, make no-install would
actually install the extra modules, but nothing else. This is inconsistent.
Diffstat (limited to 'Makefile.SH')
| -rwxr-xr-x | Makefile.SH | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.SH b/Makefile.SH index da00514d90..ef304795df 100755 --- a/Makefile.SH +++ b/Makefile.SH @@ -1020,9 +1020,10 @@ for name in all notify silent strip verbose; do install_$name install-$name: \$(INSTALL_DEPENDENCE) installperl all installman \$(RUN_PERL) installperl --destdir=\$(DESTDIR) ${flags%--all} \$(INSTALLFLAGS) \$(STRIPFLAGS) - -@test ! -s extras.lst || PATH="`pwd`:\${PATH}" PERL5LIB="`pwd`/lib" \$(RUN_PERL) -Ilib -MCPAN -e '@ARGV&&install(@ARGV)' \`cat extras.lst\` \$(RUN_PERL) installman --destdir=\$(DESTDIR) ${flags%--all} EOT + + test $name = notify || echo ' -@test ! -s extras.lst || PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(RUN_PERL) -Ilib -MCPAN -e '\''@ARGV&&install(@ARGV)'\'' `cat extras.lst`' >>$Makefile done $spitshell >>$Makefile <<'!NO!SUBS!' |