Move VMS::Filespec from vms/ext to ext/

[perl5.git] / installperl

diff --git a/installperl b/installperl
index c19bff1..ac1c770 100755 (executable)
--- a/installperl
+++ b/installperl
@@ -299,16 +299,6 @@ if ($Is_VMS) {
        chmod(0755, "$installbin/${dbg}a2p$exe_ext");
     }
 }
-elsif ($^O eq 'mpeix') {
-    # MPE lacks hard links and requires that executables with special
-    # capabilities reside in the MPE namespace.
-    safe_unlink("$installbin/perl$ver$exe_ext", $Config{perlpath});
-    # Install the primary executable into the MPE namespace as perlpath.
-    copy("perl$exe_ext", $Config{perlpath});
-    chmod(0755, $Config{perlpath});
-    # Create a backup copy with the version number.
-    link($Config{perlpath}, "$installbin/perl$ver$exe_ext");
-}
 elsif ($^O ne 'dos') {
     if (!$Is_NetWare) {
        safe_unlink("$installbin/$perl_verbase$ver$exe_ext");
@@ -389,18 +379,13 @@ elsif ($Is_Cygwin) { # On Cygwin symlink it to CORE to make Makefile happy
 
     # AIX needs perl.exp installed as well.
     push(@corefiles,'perl.exp') if $^O eq 'aix';
-    if ($^O eq 'mpeix') {
-       # MPE needs mpeixish.h installed as well.
-       mkpath("$installarchlib/CORE/mpeix", $opts{verbose}, 0777);
-       push(@corefiles,'mpeix/mpeixish.h');
-    }
 }
 foreach my $file (@corefiles) {
     # HP-UX (at least) needs to maintain execute permissions
     # on dynamically-loadable libraries. So we do it for all.
     if (copy_if_diff($file,"$installarchlib/CORE/$file")) {
        if ($file =~ /\.(\Q$so\E|\Q$dlext\E)$/) {
-           strip("-S", "$installarchlib/CORE/$file") if $^O =~ /^(rhapsody|darwin)$/;
+           strip("-S", "$installarchlib/CORE/$file") if $^O eq 'darwin';
            chmod(0555, "$installarchlib/CORE/$file");
        } else {
            chmod(0444, "$installarchlib/CORE/$file");
@@ -413,11 +398,7 @@ foreach my $file (@corefiles) {
 
 if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS && ! $Is_NetWare) {
     safe_unlink("$installbin/$perl$exe_ext", "$installbin/suid$perl$exe_ext");
-    if ($^O eq 'mpeix') {
-       # MPE doesn't support hard links, so use a symlink.
-       # We don't want another cloned copy.
-       symlink($Config{perlpath}, "$installbin/perl$exe_ext");
-    } elsif ($^O eq 'vos') {
+    if ($^O eq 'vos') {
        # VOS doesn't support hard links, so use a symlink.
        symlink("$installbin/$perl_verbase$ver$exe_ext",
                "$installbin/$perl$exe_ext");
@@ -432,11 +413,7 @@ if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VM
 if ($archname && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS) {
     my $archperl = "$perl_verbase$ver-$Config{archname}$exe_ext";
     safe_unlink("$installbin/$archperl");
-    if ($^O eq 'mpeix') {
-       # MPE doesn't support hard links, so use a symlink.
-       # We don't want another cloned copy.
-       symlink($Config{perlpath}, "$installbin/$archperl");
-    } elsif ($^O eq 'vos') {
+    if ($^O eq 'vos') {
        # VOS doesn't support hard links, so use a symlink.
        symlink("$installbin/$perl_verbase$ver$exe_ext",
                "$installbin/$archperl");
@@ -694,7 +671,7 @@ sub installlib {
     # this, as $_ becomes a pathname, and so still works. However, it's not
     # obvious that $_ is needed later, and hence $_ must not be modified.
 
-    # Also, many of the regex exlusion tests below are now superfluous, as the
+    # Also, many of the regex exclusion tests below are now superfluous, as the
     # files in question are either no longer in blead, or now in ext/, dist/ or
     # cpan/ and not copied into lib/
 
@@ -714,7 +691,7 @@ sub installlib {
     # lib/Archive/Tar/bin, the config_data script in lib/Module/Build/scripts
     # and zipdetails in cpan/IO-Compress/bin
     # (they're installed later with other utils)
-    return if $name =~ /^(?:cpan|instmodsh|prove|corelist|ptar|cpan2dist|cpanp|cpanp-run-perl|ptardiff|ptargrep|config_data|zipdetails)\z/;
+    return if $name =~ /^(?:cpan|instmodsh|prove|corelist|ptar|ptardiff|ptargrep|config_data|zipdetails)\z/;
     # ignore the Makefiles
     return if $name =~ /^makefile$/i;
     # ignore the test extensions
@@ -800,7 +777,7 @@ sub installlib {
            # on dynamically-loaded libraries.
             if (copy_if_diff($_, "$installlib/$name")) {
                 strip("-S", "$installlib/$name")
-                    if $^O =~ /^(rhapsody|darwin)$/ and /\.(?:so|$dlext|a)$/;
+                    if $^O eq 'darwin' and /\.(?:so|$dlext|a)$/;
                 chmod(/\.(so|$dlext)$/ ? 0555 : 0444, "$installlib/$name");
             }
        }