integrate changes#3091-3094 from maint-5.005

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

diff --git a/installperl b/installperl
index 979000c..93b9947 100755 (executable)
--- a/installperl
+++ b/installperl
@@ -50,7 +50,8 @@ umask 022 unless $Is_VMS;
 my @scripts = qw(utils/c2ph utils/h2ph utils/h2xs utils/perlbug utils/perldoc
                utils/pl2pm utils/splain utils/perlcc
                x2p/s2p x2p/find2perl 
-               pod/pod2man pod/pod2html pod/pod2latex pod/pod2text);
+               pod/pod2man pod/pod2html pod/pod2latex pod/pod2text
+               pod/pod2usage pod/podchecker pod/podselect);
 
 if ($scr_ext) { @scripts = map { "$_$scr_ext" } @scripts; }
 
@@ -87,8 +88,8 @@ my $ver = $];
 my $release = substr($ver,0,3);   # Not used presently.
 my $patchlevel = substr($ver,3,2);
 die "Patchlevel of perl ($patchlevel)",
-    "and patchlevel of config.sh ($Config{'PATCHLEVEL'}) don't match\n"
-       if $patchlevel != $Config{'PATCHLEVEL'};
+    "and patchlevel of config.sh ($Config{'PERL_VERSION'}) don't match\n"
+       if $patchlevel != $Config{'PERL_VERSION'};
 
 # Fetch some frequently-used items from %Config
 my $installbin = $Config{installbin};
@@ -172,6 +173,7 @@ elsif ($^O eq 'mpeix') {
 elsif ($^O ne 'dos') {
     safe_unlink("$installbin/$perl$ver$exe_ext");
     copy("perl$exe_ext", "$installbin/$perl$ver$exe_ext");
+    strip("$installbin/perl$ver$exe_ext") if $^O =~ /^(rhapsody)$;
     chmod(0755, "$installbin/$perl$ver$exe_ext");
 }
 else {
@@ -231,9 +233,14 @@ else {
 foreach my $file (@corefiles) {
     # HP-UX (at least) needs to maintain execute permissions
     # on dynamically-loadable libraries. So we do it for all.
-    copy_if_diff($file,"$installarchlib/CORE/$file")
-       and chmod($file =~ /\.(so|\Q$dlext\E)$/ ? 0555 : 0444,
-                  "$installarchlib/CORE/$file");
+    if (copy_if_diff($file,"$installarchlib/CORE/$file")) {
+       if ($file =~ /\.(so|\Q$dlext\E)$/) {
+           chmod(0555, "$installarchlib/CORE/$file");
+           strip("-S", "$installarchlib/CORE/$file") if $^O =~ /^(rhapsody)$;
+       } else {
+           chmod(0444, "$installarchlib/CORE/$file");
+       }
+    }
 }
 
 # Install main perl executables
@@ -602,3 +609,23 @@ sub copy_if_diff {
        1;
     }
 }
+
+sub strip
+{
+    my(@args) = @_;
+
+    my @opts;
+    while (@args && $args[0] =~ /^(-\w+)$/) {
+        push @opts, shift @args;
+    }
+
+    foreach my $file (@args) {
+        if (-f $file) {
+            print STDERR "  strip $file\n";
+            system("strip", @opts, $file);
+        } else {
+            print STDERR "# file '$file' skipped\n";
+        }
+    }
+}
+