Add the fruits of Larry Shatzer's version verifying script.

[p5sagit/p5-mst-13.2.git] / lib / ExtUtils / Install.pm

diff --git a/lib/ExtUtils/Install.pm b/lib/ExtUtils/Install.pm
index c496aa0..14a6e08 100644 (file)
--- a/lib/ExtUtils/Install.pm
+++ b/lib/ExtUtils/Install.pm
@@ -1,8 +1,8 @@
 package ExtUtils::Install;
 
-use 5.005_64;
+use 5.006_001;
 our(@ISA, @EXPORT, $VERSION);
-$VERSION = substr q$Revision: 1.28 $, 10;
+$VERSION = substr q$Revision: 1.29 $, 10;
 # $Date: 1998/01/25 07:08:24 $
 
 use Exporter;
@@ -120,7 +120,6 @@ sub install {
            return unless -f _;
            return if $_ eq ".exists";
            my $targetdir  = MY->catdir($targetroot, $File::Find::dir);
-           my $origfile   = $_;
            my $targetfile = MY->catfile($targetdir, $_);
 
            my $diff = 0;
@@ -156,7 +155,7 @@ sub install {
            } else {
                inc_uninstall($_,$File::Find::dir,$verbose,0); # nonono set to 0
            }
-           $packlist->{$origfile}++;
+           $packlist->{$targetfile}++;
 
        }, ".");
        chdir($cwd) or Carp::croak("Couldn't chdir to $cwd: $!");
@@ -264,16 +263,15 @@ sub inc_uninstall {
 
 sub run_filter {
     my ($cmd, $src, $dest) = @_;
-    local *SRC, *CMD;
-    open(CMD, "|$cmd >$dest") || die "Cannot fork: $!";
-    open(SRC, $src)           || die "Cannot open $src: $!";
+    open(my $CMD, "|$cmd >$dest") || die "Cannot fork: $!";
+    open(my $SRC, $src)           || die "Cannot open $src: $!";
     my $buf;
     my $sz = 1024;
-    while (my $len = sysread(SRC, $buf, $sz)) {
-       syswrite(CMD, $buf, $len);
+    while (my $len = sysread($SRC, $buf, $sz)) {
+       syswrite($CMD, $buf, $len);
     }
-    close SRC;
-    close CMD or die "Filter command '$cmd' failed for $src";
+    close $SRC;
+    close $CMD or die "Filter command '$cmd' failed for $src";
 }
 
 sub pm_to_blib {