diff options
| author | Max Kanat-Alexander <mkanat@bugzilla.org> | 2010-04-20 01:24:06 +0200 |
|---|---|---|
| committer | Max Kanat-Alexander <mkanat@bugzilla.org> | 2010-04-20 01:24:06 +0200 |
| commit | b2b1427ab7605f483f7b32381701bdf14cc174f9 (patch) | |
| tree | bf26b79a0d9faff419f6c4d9a583232219013c4a | |
| parent | 049ae4ae5d0367485910064f62b1baf38fdaad04 (diff) | |
| download | bugzilla-b2b1427ab7605f483f7b32381701bdf14cc174f9.tar.gz bugzilla-b2b1427ab7605f483f7b32381701bdf14cc174f9.tar.xz | |
Bug 560318: Make install-module.pl correctly install modules that use
Module::Build when a modern version of Module::Build is installed
(DateTime uses Module::Build.)
r=mkanat, a=mkanat (module owner)
| -rw-r--r-- | Bugzilla/Install/CPAN.pm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Bugzilla/Install/CPAN.pm b/Bugzilla/Install/CPAN.pm index b37e6d40d..a3f83564b 100644 --- a/Bugzilla/Install/CPAN.pm +++ b/Bugzilla/Install/CPAN.pm @@ -152,6 +152,8 @@ sub set_cpan_config { # Unless specified, we install the modules into the Bugzilla directory. if (!$do_global) { + require Config; + $CPAN::Config->{makepl_arg} .= " LIB=\"$bzlib\"" . " INSTALLMAN1DIR=\"$bzlib/man/man1\"" . " INSTALLMAN3DIR=\"$bzlib/man/man3\"" @@ -162,7 +164,10 @@ sub set_cpan_config { # INSTALLDIRS=perl is set because that makes sure that MakeMaker # always uses the directories we've specified here. . " INSTALLDIRS=perl"; - $CPAN::Config->{mbuild_arg} = "--install_base \"$bzlib\""; + $CPAN::Config->{mbuild_arg} = " --install_base \"$bzlib\"" + . " --install_path lib=\"$bzlib\"" + . " --install_path arch=\"$bzlib/$Config::Config{archname}\""; + $CPAN::Config->{mbuild_install_arg} = $CPAN::Config->{mbuild_arg}; # When we're not root, sometimes newer versions of CPAN will # try to read/modify things that belong to root, unless we set |