diff options
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.14.2/debian/cpan_definstalldirs.diff')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.14.2/debian/cpan_definstalldirs.diff | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.14.2/debian/cpan_definstalldirs.diff b/meta/recipes-devtools/perl/perl-5.14.2/debian/cpan_definstalldirs.diff new file mode 100644 index 0000000000..9fa937819e --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.14.2/debian/cpan_definstalldirs.diff | |||
@@ -0,0 +1,37 @@ | |||
1 | From 4b63b9a433661cd13cfb1448dbfb90c5f53a53be 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 | ||
12 | --- | ||
13 | cpan/CPAN/lib/CPAN/FirstTime.pm | 4 ++-- | ||
14 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm | ||
17 | index 667bdca..c38c890 100644 | ||
18 | --- a/cpan/CPAN/lib/CPAN/FirstTime.pm | ||
19 | +++ b/cpan/CPAN/lib/CPAN/FirstTime.pm | ||
20 | @@ -990,7 +990,7 @@ sub init { | ||
21 | my_prompt_loop(prefer_installer => 'MB', $matcher, 'MB|EUMM|RAND'); | ||
22 | |||
23 | if (!$matcher or 'makepl_arg make_arg' =~ /$matcher/) { | ||
24 | - my_dflt_prompt(makepl_arg => "", $matcher); | ||
25 | + my_dflt_prompt(makepl_arg => "INSTALLDIRS=site", $matcher); | ||
26 | my_dflt_prompt(make_arg => "", $matcher); | ||
27 | if ( $CPAN::Config->{makepl_arg} =~ /LIBS=|INC=/ ) { | ||
28 | $CPAN::Frontend->mywarn( | ||
29 | @@ -1022,7 +1022,7 @@ sub init { | ||
30 | my_dflt_prompt(make_install_arg => $CPAN::Config->{make_arg} || "", | ||
31 | $matcher); | ||
32 | |||
33 | - my_dflt_prompt(mbuildpl_arg => "", $matcher); | ||
34 | + my_dflt_prompt(mbuildpl_arg => "--installdirs site", $matcher); | ||
35 | my_dflt_prompt(mbuild_arg => "", $matcher); | ||
36 | |||
37 | if (exists $CPAN::HandleConfig::keys{mbuild_install_build_command} | ||