MAking Solaris malloc() the default

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

diff --git a/installperl b/installperl
index b027d02..dbdd6b5 100755 (executable)
--- a/installperl
+++ b/installperl
@@ -60,6 +60,8 @@ while (@ARGV) {
     shift;
 }
 
+$versiononly = 1 if $Config{versiononly};
+
 my @scripts = qw(utils/c2ph utils/h2ph utils/h2xs utils/perlbug utils/perldoc
                utils/pl2pm utils/splain utils/perlcc utils/dprofpp
                x2p/s2p x2p/find2perl 
@@ -78,6 +80,7 @@ my @pods = (<pod/*.pod>);
 # files under the archlib directory.
 my %archpms = (
     Config => 1, 
+    lib => 1, 
 );
 
 if ($^O eq 'dos') {
@@ -114,7 +117,7 @@ find(sub {
 # print "[$_]\n" for sort keys %archpms;
 
 my $ver = $Config{version};
-my $release = substr($],0,3);   # Not used presently.
+my $release = substr($],0,3);   # Not used currently.
 my $patchlevel = substr($],3,2);
 die "Patchlevel of perl ($patchlevel)",
     "and patchlevel of config.sh ($Config{'PERL_VERSION'}) don't match\n"
@@ -134,6 +137,15 @@ my $libperl = $Config{libperl};
 my $so = $Config{so};
 my $dlext = $Config{dlext};
 my $dlsrc = $Config{dlsrc};
+if ($^O eq 'os390') {
+    my $pwd;
+    chomp($pwd=`pwd`);
+    my $archlibexp = $Config{archlibexp};
+    my $usedl = $Config{usedl};
+    if ($usedl eq 'define') {
+        `./$^X -pibak -e 's{$pwd\/libperl.x}{$archlibexp/CORE/libperl.x}' lib/Config.pm`;
+    }
+}
 
 my $d_dosuid = $Config{d_dosuid};
 my $binexp = $Config{binexp};
@@ -160,8 +172,8 @@ if ($d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
 -x 'suidperl' . $exe_ext|| die "suidperl isn't executable!\n" if $d_dosuid;
 
 -f 't/rantests'                || $Is_W32
-                       || warn "WARNING: You've never run 'make test'!!!",
-                               "  (Installing anyway.)\n";
+                        || warn "WARNING: You've never run 'make test' or",
+                                " some tests failed! (Installing anyway.)\n";
 
 if ($Is_W32 or $Is_Cygwin) {
   my $perldll;
@@ -364,30 +376,25 @@ if (! $versiononly && (-f 'cppstdin') && (! samepath($installbin, '.'))) {
     chmod(0755, "$installbin/cppstdin");
 }
 
-if ($Config{installscripts} eq 'define') {
+if (! $versiononly) {
     # Install scripts.
 
     mkpath($installscript, $verbose, 0777);
 
-    if (! $versiononly) {
-       for (@scripts) {
-           (my $base = $_) =~ s#.*/##;
-           copy($_, "$installscript/$base");
-           chmod(0755, "$installscript/$base");
-       }
+    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");
-       }
+    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");
     }
 }
 
@@ -395,7 +402,7 @@ if ($Config{installscripts} eq 'define') {
 # ($installprivlib/pods for cygwin).
 
 my $pod = $Is_Cygwin ? 'pods' : 'pod';
-unless ( $versiononly && !($installprivlib =~ m/\Q$ver/)) {
+if ( !$versiononly || ($installprivlib =~ m/\Q$ver/)) {
     mkpath("${installprivlib}/$pod", $verbose, 0777);
 
     # If Perl 5.003's perldiag.pod is there, rename it.
@@ -606,8 +613,8 @@ sub installlib {
     }
     
     # ignore patch backups, RCS files, emacs backup & temp files and the
-    # .exists files.
-    return if $name =~ m{\.orig$|~$|^#.+#$|,v$|^\.exists};
+    # .exists files, and .PL files.
+    return if $name =~ m{\.orig$|~$|^#.+#$|,v$|^\.exists|\.PL$};
 
     $name = "$dir/$name" if $dir ne '';