| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 5ff1f21484aab68efe321ff4ba5d35928f72af96 Mon Sep 17 00:00:00 2001 |
| 2 | From: Brendan O'Dea <bod@debian.org> |
| 3 | Date: Tue, 8 Mar 2005 19:30:38 +1100 |
| 4 | Subject: Provide a sensible INSTALLDIRS default for modules installed from |
| 5 | CPAN. |
| 6 | |
| 7 | Some modules which are included in core set INSTALLDIRS => 'perl' |
| 8 | explicitly in Makefile.PL or Build.PL. This makes sense for the normal @INC |
| 9 | ordering, but not ours. |
| 10 | |
| 11 | Patch-Name: debian/cpan_definstalldirs.diff |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 12 | Upstream-Status: Pending |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 13 | --- |
| 14 | cpan/CPAN/lib/CPAN/FirstTime.pm | 4 ++-- |
| 15 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 16 | |
| 17 | diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm |
| 18 | index 918e009..33054cd 100644 |
| 19 | --- a/cpan/CPAN/lib/CPAN/FirstTime.pm |
| 20 | +++ b/cpan/CPAN/lib/CPAN/FirstTime.pm |
| 21 | @@ -1024,7 +1024,7 @@ sub init { |
| 22 | my_prompt_loop(prefer_installer => 'MB', $matcher, 'MB|EUMM|RAND'); |
| 23 | |
| 24 | if (!$matcher or 'makepl_arg make_arg' =~ /$matcher/) { |
| 25 | - my_dflt_prompt(makepl_arg => "", $matcher); |
| 26 | + my_dflt_prompt(makepl_arg => "INSTALLDIRS=site", $matcher); |
| 27 | my_dflt_prompt(make_arg => "", $matcher); |
| 28 | if ( $CPAN::Config->{makepl_arg} =~ /LIBS=|INC=/ ) { |
| 29 | $CPAN::Frontend->mywarn( |
| 30 | @@ -1056,7 +1056,7 @@ sub init { |
| 31 | my_dflt_prompt(make_install_arg => $CPAN::Config->{make_arg} || "", |
| 32 | $matcher); |
| 33 | |
| 34 | - my_dflt_prompt(mbuildpl_arg => "", $matcher); |
| 35 | + my_dflt_prompt(mbuildpl_arg => "--installdirs site", $matcher); |
| 36 | my_dflt_prompt(mbuild_arg => "", $matcher); |
| 37 | |
| 38 | if (exists $CPAN::HandleConfig::keys{mbuild_install_build_command} |