Finalize change #4232.

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

diff --git a/lib/ExtUtils/Install.pm b/lib/ExtUtils/Install.pm
index 992d178..47bde0d 100644 (file)
--- a/lib/ExtUtils/Install.pm
+++ b/lib/ExtUtils/Install.pm
@@ -81,10 +81,11 @@ sub install {
        #there are any files in arch. So we depend on having ./blib/arch
        #hardcoded here.
        my $targetroot = $hash{$source};
-       if ($source eq "./blib/lib" and
-           exists $hash{"./blib/arch"} and
-           directory_not_empty("./blib/arch")) {
-           $targetroot = $hash{"./blib/arch"};
+       if ($source eq "blib/lib" and
+           exists $hash{"blib/arch"} and
+           directory_not_empty("blib/arch")) {
+           $targetroot = $hash{"blib/arch"};
+            print "Files found in blib/arch: installing files in blib/lib into architecture dependent library tree\n";
        }
        chdir($source) or next;
        find(sub {
@@ -133,13 +134,13 @@ sub install {
        }, ".");
        chdir($cwd) or Carp::croak("Couldn't chdir to $cwd: $!");
     }
-    umask $umask unless $Is_VMS;
     if ($pack{'write'}) {
        $dir = dirname($pack{'write'});
        mkpath($dir,0,0755);
        print "Writing $pack{'write'}\n";
        $packlist->write($pack{'write'});
     }
+    umask $umask unless $Is_VMS;
 }
 
 sub directory_not_empty ($) {
@@ -351,7 +352,7 @@ The argument is the value of MakeMaker's C<FULLEXT> key, like F<Tk/Canvas>.
 This function calls install() with the same arguments as the defaults 
 the MakeMaker would use.
 
-The argumement-less form is convenient for install scripts like
+The argument-less form is convenient for install scripts like
 
   perl -MExtUtils::Install -e install_default Tk/Canvas