From: Steve Peters <steve@fisharerojo.org>
Date: Mon, 24 Mar 2008 17:55:29 +0000 (+0000)
Subject: Upgrade to Module-Pluggable-3.8
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c21563cb952f33aab448d45c593a420d9e28401a;p=p5sagit%2Fp5-mst-13.2.git

Upgrade to Module-Pluggable-3.8

p4raw-id: //depot/perl@33552
---

diff --git a/ext/Module/Pluggable/Makefile.PL b/ext/Module/Pluggable/Makefile.PL
index ec527ec..9fcc275 100644
--- a/ext/Module/Pluggable/Makefile.PL
+++ b/ext/Module/Pluggable/Makefile.PL
@@ -14,34 +14,35 @@ my %dodgy_files = (
 
 my $core = grep { $_ eq 'PERL_CORE=1' } @ARGV;
 my @path = $core ? (File::Spec->updir, File::Spec->updir, File::Spec->updir,
-		    "t", "Module_Pluggable") : ($FindBin::Bin,"t");
-my @files;
+                   "t", "Module_Pluggable") : ($FindBin::Bin,"t");
 
+my @files;
 if ($^O ne 'VMS' && $^O ne 'VOS') {
     foreach my $test (keys %dodgy_files) {
-        my ($file) = (catfile(@path, "lib", $test)=~/^(.*)$/);
+        my ($file) = (catfile($FindBin::Bin,"t","lib", $test)=~/^(.*)$/);
         if (open(my $fh, ">", $file)) {
             my $name = $dodgy_files{$test};
             print $fh "package $name;\nsub new {}\n1;";
             close($fh);
-        push @files, $file;
+            push @files, $file;
         }
     }
 }
 
+
 WriteMakefile
 (
-          'NAME' => 'Module::Pluggable',
+          'NAME'         => 'Module::Pluggable',
           'VERSION_FROM' => 'lib/Module/Pluggable.pm',
-          'PREREQ_PM' => {
+          'PREREQ_PM'    => {
                            'File::Basename' => '0',
                            'File::Spec' => '3.00',
                            'Test::More' => '0.62'
                          },
-          'INSTALLDIRS' => 'site',
-          'EXE_FILES' => [],
-          'PL_FILES' => {},
-          'realclean'  => {FILES=> join ' ', @files},
+          'EXE_FILES'    => [],
+          'INSTALLDIRS'  => ($] >= 5.008009) ? "perl" : "site",
+          'PL_FILES'     => {},
+          'realclean'    => {FILES=> join ' ', @files},
           # In the core pods will be built by installman.
           $core ? (MAN3PODS => {}) : (),
         )
diff --git a/ext/Module/Pluggable/lib/Module/Pluggable.pm b/ext/Module/Pluggable/lib/Module/Pluggable.pm
index 7100d5c..7de3033 100644
--- a/ext/Module/Pluggable/lib/Module/Pluggable.pm
+++ b/ext/Module/Pluggable/lib/Module/Pluggable.pm
@@ -9,7 +9,7 @@ use Module::Pluggable::Object;
 # Peter Gibbons: I wouldn't say I've been missing it, Bob! 
 
 
-$VERSION = '3.7';
+$VERSION = '3.8';
 
 sub import {
     my $class        = shift;