PATCH 5.6 perldebguts grammar cleanup

[p5sagit/p5-mst-13.2.git] / installperl

diff --git a/installperl b/installperl
index eb2a31e..b027d02 100755 (executable)
--- a/installperl
+++ b/installperl
@@ -56,7 +56,7 @@ while (@ARGV) {
     $versiononly = 1 if $ARGV[0] eq '-v';
     $silent = 1 if $ARGV[0] eq '-S';
     $otherperls = 0 if $ARGV[0] eq '-o';
-    $verbose = 1 if $ARGV[0] eq '-V';
+    $verbose = 1 if $ARGV[0] eq '-V' || $ARGV [0] eq '-n';
     shift;
 }
 
@@ -151,7 +151,7 @@ if ($Is_VMS) {  # Hang in there until File::Spec hits the big time
 if ($d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
 
    $installbin         || die "No installbin directory in config.sh\n";
--d $installbin         || mkpath($installbin, 1, 0777);
+-d $installbin         || mkpath($installbin, $verbose, 0777);
 -d $installbin         || $nonono || die "$installbin is not a directory\n";
 -w $installbin         || $nonono || die "$installbin is not writable by you\n"
        unless $installbin =~ m#^/afs/# || $nonono;
@@ -159,7 +159,7 @@ if ($d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
 -x 'perl' . $exe_ext   || die "perl isn't executable!\n";
 -x 'suidperl' . $exe_ext|| die "suidperl isn't executable!\n" if $d_dosuid;
 
--f 't/ran_tests'       || $Is_W32
+-f 't/rantests'                || $Is_W32
                        || warn "WARNING: You've never run 'make test'!!!",
                                "  (Installing anyway.)\n";
 
@@ -236,10 +236,10 @@ if ($d_dosuid) {
 
 my ($do_installarchlib, $do_installprivlib) = (0, 0);
     
-mkpath($installprivlib, 1, 0777);
-mkpath($installarchlib, 1, 0777);
-mkpath($installsitelib, 1, 0777) if ($installsitelib);
-mkpath($installsitearch, 1, 0777) if ($installsitearch);
+mkpath($installprivlib, $verbose, 0777);
+mkpath($installarchlib, $verbose, 0777);
+mkpath($installsitelib, $verbose, 0777) if ($installsitelib);
+mkpath($installsitearch, $verbose, 0777) if ($installsitearch);
 
 if (chdir "lib") {
     $do_installarchlib = ! samepath($installarchlib, '.');
@@ -256,7 +256,7 @@ else {
 }
 
 # Install header files and libraries.
-mkpath("$installarchlib/CORE", 1, 0777);
+mkpath("$installarchlib/CORE", $verbose, 0777);
 my @corefiles;
 if ($Is_VMS) {  # We did core file selection during build
     my $coredir = "lib/$Config{archname}/$ver/CORE";
@@ -271,7 +271,7 @@ else {
     push(@corefiles,'perl.exp') if $^O eq 'aix';
     if ($^O eq 'mpeix') {
         # MPE needs mpeixish.h installed as well.
-        mkpath("$installarchlib/CORE/mpeix", 1, 0777);
+        mkpath("$installarchlib/CORE/mpeix", $verbose, 0777);
         push(@corefiles,'mpeix/mpeixish.h');
     }
     # If they have built sperl.o...
@@ -364,26 +364,30 @@ if (! $versiononly && (-f 'cppstdin') && (! samepath($installbin, '.'))) {
     chmod(0755, "$installbin/cppstdin");
 }
 
-# Install scripts.
+if ($Config{installscripts} eq 'define') {
+    # Install scripts.
 
-mkpath($installscript, 1, 0777);
+    mkpath($installscript, $verbose, 0777);
 
-if (! $versiononly) {
-    for (@scripts) {
-       (my $base = $_) =~ s#.*/##;
-       copy($_, "$installscript/$base");
-       chmod(0755, "$installscript/$base");
+    if (! $versiononly) {
+       for (@scripts) {
+           (my $base = $_) =~ s#.*/##;
+           copy($_, "$installscript/$base");
+           chmod(0755, "$installscript/$base");
+       }
     }
-}
 
-# pstruct should be a link to c2ph
-
-if (! $versiononly) {
-    safe_unlink("$installscript/pstruct$scr_ext");
-    if ($^O eq 'dos' or $Is_VMS or $^O eq 'transit') {
-        copy("$installscript/c2ph$scr_ext", "$installscript/pstruct$scr_ext"); 
-    } else {
-        link("$installscript/c2ph$scr_ext", "$installscript/pstruct$scr_ext");
+    # pstruct should be a link to c2ph
+    
+    if (! $versiononly) {
+       safe_unlink("$installscript/pstruct$scr_ext");
+       if ($^O eq 'dos' or $Is_VMS or $^O eq 'transit') {
+           copy("$installscript/c2ph$scr_ext",
+                "$installscript/pstruct$scr_ext"); 
+       } else {
+           link("$installscript/c2ph$scr_ext",
+                "$installscript/pstruct$scr_ext");
+       }
     }
 }
 
@@ -392,7 +396,7 @@ if (! $versiononly) {
 
 my $pod = $Is_Cygwin ? 'pods' : 'pod';
 unless ( $versiononly && !($installprivlib =~ m/\Q$ver/)) {
-    mkpath("${installprivlib}/$pod", 1, 0777);
+    mkpath("${installprivlib}/$pod", $verbose, 0777);
 
     # If Perl 5.003's perldiag.pod is there, rename it.
     if (open POD, "${installprivlib}/$pod/perldiag.pod") {
@@ -630,7 +634,7 @@ sub installlib {
         $packlist->{"$installlib/$name"} = { type => 'file' };
        if (compare($_, "$installlib/$name") || $nonono) {
            unlink("$installlib/$name");
-           mkpath("$installlib/$dir", 1, 0777);
+           mkpath("$installlib/$dir", $verbose, 0777);
            # HP-UX (at least) needs to maintain execute permissions
            # on dynamically-loaded libraries.
            copy_if_diff($_, "$installlib/$name")