X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Flib_pm.PL;h=f6bb665decbce0c931f808a0dfe4437901df142c;hb=6d5637c3050c14fb5c11ec5a05db33dce9e4a7a8;hp=daca494b759175973d25ef5b2aef3aba71636082;hpb=d5201bd266fe42b2df8b480183c08be291a1ad06;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/lib_pm.PL b/lib/lib_pm.PL
index daca494..f6bb665 100644
--- 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 $invcer (@inc_version_list)
+	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 infront 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;
@@ -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 =~ /:$/;
     }