diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2001-04-15 19:34:09 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2001-04-15 19:34:09 +0000 |
| commit | 007a26ab2be0b873237f3a61ccecf090ddb56db1 (patch) | |
| tree | 888b4b4871681f0a7787d459f08c31bd61daa5e2 /lib/ExtUtils/Install.pm | |
| parent | 1c41c9bfb7f60b33ff8b2ffe4f079a27b25ff8ad (diff) | |
| download | perl-007a26ab2be0b873237f3a61ccecf090ddb56db1.tar.gz | |
Integrate changes #9706,9707 from maintperl into mainline.
change#7210 broke .packlist generation
ExtUtils::Installed doesn't quote regex metacharacters in paths
before using them in match; also make it work for dosish platforms
p4raw-link: @9707 on //depot/maint-5.6/perl: db42da4c9800ba185697f6472eccf880cdf1ccee
p4raw-link: @9706 on //depot/maint-5.6/perl: cb820f7234868a6a8a82c3314f11a1c3d25756a4
p4raw-link: @7210 on //depot/perl: a9d83807f0f0b611a2eea3bda7bb80eac9d5b104
p4raw-id: //depot/perl@9709
p4raw-integrated: from //depot/maint-5.6/perl@9708 'copy in'
lib/ExtUtils/Install.pm (@8642..) 'merge in'
lib/ExtUtils/Installed.pm (@5902..)
Diffstat (limited to 'lib/ExtUtils/Install.pm')
| -rw-r--r-- | lib/ExtUtils/Install.pm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/ExtUtils/Install.pm b/lib/ExtUtils/Install.pm index c496aa0ae5..0a1b549801 100644 --- a/lib/ExtUtils/Install.pm +++ b/lib/ExtUtils/Install.pm @@ -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: $!"); |