diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2003-03-12 10:52:17 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2003-03-12 10:52:17 +0000 |
| commit | 63c6dcc1775b960c3418c4c23568c59231321ed1 (patch) | |
| tree | 528363eb7ff155c88cd4cfb247b2bbd5fe807b4b /lib/lib_pm.PL | |
| parent | 7d4724a48fc64f7514654a326453c9b631d3a294 (diff) | |
| download | perl-63c6dcc1775b960c3418c4c23568c59231321ed1.tar.gz | |
Integrate:
[ 18946]
Integrate from maint-5.8/macperl:
[ 18937]
Various MacOS portability fixes for tests
[ 18938]
File::Spec::Unix method should be called on $self
[ 18939]
lib.pm:_get_dirs() should use $_[0], not $_
[ 18940]
Update MacOS for new configpm
[ 18941]
Update MacOS build
Update Makefile for new source files,
update test script, add additional symbol for APItest
p4raw-link: @18946 on //depot/maint-5.8/perl: 494df11159c23652339c95affadb99da70ef89e6
p4raw-link: @18941 on //depot/maint-5.8/macperl: 9b3df31c299856a4cb17c1b4a9c403df0a69ec28
p4raw-link: @18940 on //depot/maint-5.8/macperl: 5d97ba7550864e5eaacd84839be0d01c212a6d00
p4raw-link: @18939 on //depot/maint-5.8/macperl: be568d45c1392c31a2787cdaf2ab37fb4a91ced1
p4raw-link: @18938 on //depot/maint-5.8/macperl: efc910e725c427d20af16b2fdf1d43228fecfc02
p4raw-link: @18937 on //depot/maint-5.8/macperl: bbcece98349dade0635a793d66ae4e883c9097d6
p4raw-id: //depot/perl@18951
p4raw-integrated: from //depot/maint-5.8/perl@18950 'copy in'
ext/POSIX/t/taint.t t/op/stat.t (@17645..)
lib/Unicode/Collate/t/index.t lib/Unicode/Collate/t/test.t
lib/lib_pm.PL t/op/mkdir.t (@18080..) ext/Filter/t/call.t
lib/charnames.t t/op/taint.t t/run/switchI.t (@18458..)
lib/File/Spec/Unix.pm (@18466..) t/io/crlf.t (@18638..)
ext/Digest/MD5/t/files.t (@18743..) t/op/method.t (@18850..)
t/pod/testp2pt.pl (@18890..) t/op/sprintf.t (@18911..)
t/op/recurse.t (@18922..)
p4raw-branched: from //depot/maint-5.8/perl@18946 'branch in'
macos/MacPerlTests.cmd macos/Makefile.mk macos/configpm
macos/macperl.sym
Diffstat (limited to 'lib/lib_pm.PL')
| -rw-r--r-- | lib/lib_pm.PL | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/lib_pm.PL b/lib/lib_pm.PL index f6bb665dec..5586368eb0 100644 --- a/lib/lib_pm.PL +++ b/lib/lib_pm.PL @@ -112,11 +112,11 @@ sub unimport { my %names; foreach (@_) { - local $_ = _nativize($_); + my $path = _nativize($_); my($arch_auto_dir, $arch_dir, $version_dir, $version_arch_dir) - = _get_dirs($_); - ++$names{$_}; + = _get_dirs($path); + ++$names{$path}; ++$names{$arch_dir} if -d $arch_auto_dir; ++$names{$version_dir} if -d $version_dir; ++$names{$version_arch_dir} if -d $version_arch_dir; @@ -134,15 +134,15 @@ sub _get_dirs { # we could use this for all platforms in the future, but leave it # Mac-only for now, until there is more time for testing it. if ($Is_MacOS) { - $arch_auto_dir = File::Spec->catdir( $_, $archname, 'auto' ); - $arch_dir = File::Spec->catdir( $_, $archname, ); - $version_dir = File::Spec->catdir( $_, $version ); - $version_arch_dir = File::Spec->catdir( $_, $version, $archname ); + $arch_auto_dir = File::Spec->catdir( $dir, $archname, 'auto' ); + $arch_dir = File::Spec->catdir( $dir, $archname, ); + $version_dir = File::Spec->catdir( $dir, $version ); + $version_arch_dir = File::Spec->catdir( $dir, $version, $archname ); } else { - $arch_auto_dir = "$_/$archname/auto"; - $arch_dir = "$_/$archname"; - $version_dir = "$_/$version"; - $version_arch_dir = "$_/$version/$archname"; + $arch_auto_dir = "$dir/$archname/auto"; + $arch_dir = "$dir/$archname"; + $version_dir = "$dir/$version"; + $version_arch_dir = "$dir/$version/$archname"; } return($arch_auto_dir, $arch_dir, $version_dir, $version_arch_dir); } |