more B fixups to cope with empty GVs (these can only happen in pads)

[perl5.git] / installman

diff --git a/installman b/installman
index 04ef578..c9fb0fe 100755 (executable)
--- a/installman
+++ b/installman
@@ -10,12 +10,11 @@ use subs qw(unlink chmod rename link);
 use vars qw($packlist);
 require Cwd;
 
-umask 022;
 $ENV{SHELL} = 'sh' if $^O eq 'os2';
 
-$ver = $];
-$release = substr($ver,0,3);   # Not used presently.
-$patchlevel = substr($ver,3,2);
+$ver = $Config{version};
+$release = substr($],0,3);   # Not used presently.
+$patchlevel = substr($],3,2);
 die "Patchlevel of perl ($patchlevel)",
     "and patchlevel of config.sh ($Config{'PERL_VERSION'}) don't match\n"
        if $patchlevel != $Config{'PERL_VERSION'};
@@ -73,8 +72,10 @@ runpod2man('utils', $man1dir, $man1ext, 'splain');
 runpod2man('utils', $man1dir, $man1ext, 'dprofpp');
 runpod2man('x2p', $man1dir, $man1ext, 's2p');
 runpod2man('x2p', $man1dir, $man1ext, 'a2p.pod');
+runpod2man('x2p', $man1dir, $man1ext, 'find2perl');
 runpod2man('pod', $man1dir, $man1ext, 'pod2man');
 runpod2man('pod', $man1dir, $man1ext, 'pod2html');
+runpod2man('pod', $man1dir, $man1ext, 'pod2text');
 runpod2man('pod', $man1dir, $man1ext, 'pod2usage');
 runpod2man('pod', $man1dir, $man1ext, 'podchecker');
 runpod2man('pod', $man1dir, $man1ext, 'podselect');
@@ -125,7 +126,8 @@ sub runpod2man {
     # of the pod.  This might be useful for pod2man someday.
     if ($script) {
        @modpods = ($script);
-    } else {
+    }
+    else {
        @modpods = ();
        find(\&lsmodpods, '.');
     }
@@ -139,18 +141,22 @@ sub runpod2man {
        # Convert name from  File/Basename.pm to File::Basename.3 format,
        # if necessary.
        $manpage =~ s#\.p(m|od)$##;
-       if ($^O eq 'os2' || $^O eq 'amigaos' || $^O eq 'uwin' || $^O =~ /cygwin/) {
+       if ($^O eq 'os2' || $^O eq 'amigaos' || $^O eq 'uwin' || $^O eq 'cygwin') {
          $manpage =~ s#/#.#g;
-       } else {
+       }
+       else {
          $manpage =~ s#/#::#g;
        }
        $tmp = "${mandir}/${manpage}.tmp";
        $manpage = "${mandir}/${manpage}.${manext}";
        if (&cmd("$pod2man $mod > $tmp") == 0 && !$notify && -s $tmp) {
-           rename($tmp, $manpage) && next;
+           if (rename($tmp, $manpage)) {
+               $packlist->{$manpage} = { type => 'file' };
+               next;
+           }
        }
        unless ($notify) {
-    unlink($tmp);
+           unlink($tmp);
        }
     }
     chdir "$builddir" || die "Unable to cd back to $builddir directory!\n$!\n";
@@ -195,11 +201,11 @@ sub unlink {
     my $cnt = 0;
 
     foreach $name (@names) {
-next unless -e $name;
-chmod 0777, $name if $^O eq 'os2';
-print STDERR "  unlink $name\n";
-( CORE::unlink($name) and ++$cnt 
-    or warn "Couldn't unlink $name: $!\n" ) unless $notify;
+       next unless -e $name;
+       chmod 0777, $name if $^O eq 'os2';
+       print STDERR "  unlink $name\n";
+       ( CORE::unlink($name) and ++$cnt 
+           or warn "Couldn't unlink $name: $!\n" ) unless $notify;
     }
     return $cnt;
 }
@@ -216,14 +222,12 @@ sub link {
               ? die "AFS"  # okay inside eval {}
               : warn "Couldn't link $from to $to: $!\n"
           unless $notify;
-        $packlist->{$to} = { type => 'file' };
     };
     if ($@) {
         File::Copy::copy($from, $to)
             ? $success++
             : warn "Couldn't copy $from to $to: $!\n"
           unless $notify;
-        $packlist->{$to} = { type => 'file' };
     }
     $success;
 }
@@ -231,16 +235,15 @@ sub link {
 sub rename {
     local($from,$to) = @_;
     if (-f $to and not unlink($to)) {
-my($i);
-for ($i = 1; $i < 50; $i++) {
-    last if CORE::rename($to, "$to.$i");
-}
-warn("Cannot rename to `$to.$i': $!"), return 0 
-    if $i >= 50;       # Give up!
+       my($i);
+       for ($i = 1; $i < 50; $i++) {
+           last if CORE::rename($to, "$to.$i");
+       }
+       warn("Cannot rename to `$to.$i': $!"), return 0 
+           if $i >= 50;        # Give up!
     }
     link($from,$to) || return 0;
     unlink($from);
-    $packlist->{$to} = { type => 'file' };
 }
 
 sub chmod {