Revert "postpone perl_parse() exit(0) bugfix"

[perl5.git] / installperl

diff --git a/installperl b/installperl
index b528c10..3c8af53 100755 (executable)
--- a/installperl
+++ b/installperl
@@ -137,11 +137,6 @@ my %archpms = (
     lib => 1,
 );
 
-if ($^O eq 'dos') {
-    push(@scripts,'djgpp/fixpmain');
-    $archpms{config} = $archpms{filehand} = 1;
-}
-
 if ((-e "testcompile") && (defined($ENV{'COMPILE'}))) {
     push(@scripts, map("$_.exe", @scripts));
 }
@@ -283,16 +278,13 @@ if ($Is_VMS) {
         chmod(0755, "$installbin/$ndbg$perl$exe_ext");
     }
 }
-elsif ($^O ne 'dos') {
+else {
     safe_unlink("$installbin/$perl_verbase$ver$exe_ext");
     copy("perl$exe_ext", "$installbin/$perl_verbase$ver$exe_ext");
     strip("$installbin/$perl_verbase$ver$exe_ext");
     fix_dep_names("$installbin/$perl_verbase$ver$exe_ext");
     chmod(0755, "$installbin/$perl_verbase$ver$exe_ext");
-}
-else {
-    safe_unlink("$installbin/$perl.exe");
-    copy("perl.exe", "$installbin/$perl.exe");
+    `chtag -r "$installbin/$perl_verbase$ver$exe_ext"` if ($^O eq 'os390');
 }
 
 # Install library files.
@@ -363,6 +355,7 @@ foreach my $file (@corefiles) {
        } else {
            chmod($NON_SO_MODE, "$installarchlib/CORE/$file");
        }
+        `chtag -r "$installarchlib/CORE/$file"` if ($^O eq 'os390');
     }
 }
 
@@ -376,7 +369,7 @@ if ($Is_W32) { #linking lib isn't made in root but in CORE on Win32
 # Install main perl executables
 # Make links to ordinary names if installbin directory isn't current directory.
 
-if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS) {
+if (! $versiononly && ! samepath($installbin, '.') && ! $Is_VMS) {
     safe_unlink("$installbin/$perl$exe_ext", "$installbin/suid$perl$exe_ext");
     if ($^O eq 'vos') {
        # VOS doesn't support hard links, so use a symlink.
@@ -390,7 +383,7 @@ if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VM
 
 # For development purposes it can be very useful to have multiple perls
 # build for different "architectures" (eg threading or not) simultaneously.
-if ($opts{archname} && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS) {
+if ($opts{archname} && ! samepath($installbin, '.') && ! $Is_VMS) {
     my $archperl = "$perl_verbase$ver-$Config{archname}$exe_ext";
     safe_unlink("$installbin/$archperl");
     if ($^O eq 'vos') {
@@ -431,6 +424,7 @@ if ($Config{installusrbinperl} && $Config{installusrbinperl} eq 'define' &&
          eval { CORE::link $instperl, $usrbinperl } )  ||
        eval { symlink $expinstperl, $usrbinperl }      ||
        copy($instperl, $usrbinperl);
+        `chtag -r "$usrbinperl"` if ($^O eq 'os390');
 
        $mainperl_is_instperl = 1;
     }
@@ -450,7 +444,7 @@ sub script_alias {
     my ($installscript, $orig, $alias, $scr_ext) = @_;
 
     safe_unlink("$installscript/$alias$scr_ext");
-    if ($^O eq 'dos' or $Is_VMS or $^O eq 'transit') {
+    if ($Is_VMS or $^O eq 'transit') {
        copy("$installscript/$orig$scr_ext",
             "$installscript/$alias$scr_ext");
     } elsif ($^O eq 'vos') {
@@ -725,6 +719,7 @@ sub copy_if_diff {
            my ($atime, $mtime) = (stat $from)[8,9];
            utime $atime, $mtime, $to;
        }
+        `chtag -r "$to"` if ($^O eq "os390");
        1;
     }
 }