In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/262731eedb57f5384b69ab925580eb75e90180b7?hp=ffc8163459b527fe692284958365016d02c16c86>
- Log ----------------------------------------------------------------- commit 262731eedb57f5384b69ab925580eb75e90180b7 Author: James E Keenan <[email protected]> Date: Sat Apr 13 17:45:10 2013 +0100 Subject: [PATCH] Update INSTALLDIRS to favor installation under 'site'. For: RT #116479 ----------------------------------------------------------------------- Summary of changes: dist/ExtUtils-CBuilder/Makefile.PL | 1 + dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder.pm | 2 +- dist/IO/IO.pm | 2 +- dist/IO/Makefile.PL | 2 +- dist/Module-CoreList/Makefile.PL | 1 + dist/Module-CoreList/lib/Module/CoreList.pm | 2 +- dist/Storable/Makefile.PL | 2 +- dist/Storable/Storable.pm | 2 +- 8 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dist/ExtUtils-CBuilder/Makefile.PL b/dist/ExtUtils-CBuilder/Makefile.PL index e6b1d16..57014a3 100644 --- a/dist/ExtUtils-CBuilder/Makefile.PL +++ b/dist/ExtUtils-CBuilder/Makefile.PL @@ -15,6 +15,7 @@ my %WriteMakefileArgs = ( "ExtUtils::MakeMaker" => "6.30" }, "EXE_FILES" => [], + "INSTALLDIRS" => ($] < 5.011 ? 'perl' : 'site'), "LICENSE" => "perl", "PREREQ_PM" => { "Cwd" => 0, diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder.pm index ad2ea0d..1caba9c 100644 --- a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder.pm +++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder.pm @@ -6,7 +6,7 @@ use File::Basename (); use Perl::OSType qw/os_type/; use vars qw($VERSION @ISA); -$VERSION = '0.280209'; +$VERSION = '0.280210'; $VERSION = eval $VERSION; # We only use this once - don't waste a symbol table entry on it. diff --git a/dist/IO/IO.pm b/dist/IO/IO.pm index 2e021c4..35aba10 100644 --- a/dist/IO/IO.pm +++ b/dist/IO/IO.pm @@ -7,7 +7,7 @@ use Carp; use strict; use warnings; -our $VERSION = "1.27"; +our $VERSION = "1.28"; XSLoader::load 'IO', $VERSION; sub import { diff --git a/dist/IO/Makefile.PL b/dist/IO/Makefile.PL index 70ffe12..7783cf9 100644 --- a/dist/IO/Makefile.PL +++ b/dist/IO/Makefile.PL @@ -39,7 +39,7 @@ WriteMakefile( ( $PERL_CORE ? () : ( - INSTALLDIRS => 'perl', + INSTALLDIRS => ($] < 5.011 ? 'perl' : 'site'), clean => {FILES => 'typemap'}, ) ), diff --git a/dist/Module-CoreList/Makefile.PL b/dist/Module-CoreList/Makefile.PL index 6235c47..9f86c61 100644 --- a/dist/Module-CoreList/Makefile.PL +++ b/dist/Module-CoreList/Makefile.PL @@ -13,6 +13,7 @@ WriteMakefile 'List::Util' => 0, }, 'EXE_FILES' => [ _scripts() ], + 'INSTALLDIRS' => ($] < 5.011 ? 'perl' : 'site'), 'PL_FILES' => {}, LICENSE => 'perl', @extra, diff --git a/dist/Module-CoreList/lib/Module/CoreList.pm b/dist/Module-CoreList/lib/Module/CoreList.pm index d9bf32c..f85b172 100644 --- a/dist/Module-CoreList/lib/Module/CoreList.pm +++ b/dist/Module-CoreList/lib/Module/CoreList.pm @@ -3,7 +3,7 @@ use strict; use vars qw/$VERSION %released %version %families %upstream %bug_tracker %deprecated/; use Module::CoreList::TieHashDelta; -$VERSION = '2.85'; +$VERSION = '2.86'; my $dumpinc = 0; sub import { diff --git a/dist/Storable/Makefile.PL b/dist/Storable/Makefile.PL index bcfd9e0..2311129 100644 --- a/dist/Storable/Makefile.PL +++ b/dist/Storable/Makefile.PL @@ -14,7 +14,7 @@ WriteMakefile( # We now ship this in t/ # PREREQ_PM => { 'Test::More' => '0.41' }, PREREQ_PM => { XSLoader => 0 }, - INSTALLDIRS => $] >= 5.007 ? 'perl' : 'site', + INSTALLDIRS => ($] >= 5.007 && $] < 5.012) ? 'perl' : 'site', VERSION_FROM => 'Storable.pm', ($ExtUtils::MakeMaker::VERSION > 6.45 ? (META_MERGE => { resources => diff --git a/dist/Storable/Storable.pm b/dist/Storable/Storable.pm index 7d53454..bb1083d 100644 --- a/dist/Storable/Storable.pm +++ b/dist/Storable/Storable.pm @@ -21,7 +21,7 @@ package Storable; @ISA = qw(Exporter); use vars qw($canonical $forgive_me $VERSION); -$VERSION = '2.40'; +$VERSION = '2.41'; BEGIN { if (eval { local $SIG{__DIE__}; require Log::Agent; 1 }) { -- Perl5 Master Repository
