Extensive documentation patch redux

[perl5.git] / lib / lib_pm.PL

diff --git a/lib/lib_pm.PL b/lib/lib_pm.PL
index edd1dda..5586368 100644 (file)
--- a/lib/lib_pm.PL
+++ b/lib/lib_pm.PL
@@ -48,6 +48,8 @@ package lib;
 
 $useConfig
 
+use strict;
+
 my \$archname         = $Config_archname;
 my \$version          = $Config_version;
 my \@inc_version_list = $Config_inc_version_list;
@@ -69,30 +71,31 @@ sub import {
 
     my %names;
     foreach (reverse @_) {
-       if ($_ eq '') {
+       my $path = $_;          # we'll be modifying it, so break the alias
+       if ($path eq '') {
            require Carp;
            Carp::carp("Empty compile time value given to use lib");
        }
 
-       local $_ = _nativize($_);
+       $path = _nativize($path);
 
-       if (-e && ! -d _) {
+       if (-e $path && ! -d _) {
            require Carp;
            Carp::carp("Parameter to use lib must be directory, not file");
        }
-       unshift(@INC, $_);
+       unshift(@INC, $path);
        # Add any previous version directories we found at configure time
        foreach my $incver (@inc_version_list)
        {
            my $dir = $Is_MacOS
-               ? File::Spec->catdir( $_, $incver )
-               : "$_/$incver";
+               ? File::Spec->catdir( $path, $incver )
+               : "$path/$incver";
            unshift(@INC, $dir) if -d $dir;
        }
-       # Put a corresponding archlib directory in front of $_ if it
-       # looks like $_ has an archlib directory below it.
+       # Put a corresponding archlib directory in front of $path if it
+       # looks like $path has an archlib directory below it.
        my($arch_auto_dir, $arch_dir, $version_dir, $version_arch_dir)
-           = _get_dirs($_);
+           = _get_dirs($path);
        unshift(@INC, $arch_dir)         if -d $arch_auto_dir;
        unshift(@INC, $version_dir)      if -d $version_dir;
        unshift(@INC, $version_arch_dir) if -d $version_arch_dir;
@@ -109,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;
@@ -131,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);
 }
@@ -147,7 +150,7 @@ sub _get_dirs {
 sub _nativize {
     my($dir) = @_;
 
-    if ($Is_MacOS && $Mac_FS) {
+    if ($Is_MacOS && $Mac_FS && ! -d $dir) {
        $dir = Mac::FileSpec::Unixish::nativize($dir);
        $dir .= ":" unless $dir =~ /:$/;
     }