Re: [PATCH] UTF-8 enabling via locale (was: Re: Redhat 8 issue?)

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

diff --git a/installman b/installman
index d871dc9..2260c26 100755 (executable)
--- a/installman
+++ b/installman
@@ -77,18 +77,21 @@ pod2man('pod', $opts{man1dir}, $opts{man1ext});
 pod2man('lib', $opts{man3dir}, $opts{man3ext});
 
 # Install the pods embedded in the installed scripts
+my $has_man1dir = $opts{man1dir} ne '' && -d $opts{man1dir};
 open UTILS, "utils.lst" or die "Can't open 'utils.lst': $!";
 while (<UTILS>) {
     next if /^#/;
     chomp;
     $_ = $1 if /#.*pod\s*=\s*(\S+)/;
-    my ($where, $what) = m|^(.*?)/(\S+)|;
+    my ($where, $what) = m|^(\S*)/(\S+)|;
     pod2man($where, $opts{man1dir}, $opts{man1ext}, $what);
-    if (my ($where2, $what2) = m|#.*link\s*=\s*(\S+)/(\S+)|) {
-       my $old = "$opts{man1dir}/$what.$opts{man1ext}";
-       my $new = "$opts{man1dir}/$what2.$opts{man1ext}";
-       unlink($new);
-        link($old, $new);
+    if ($has_man1dir) {
+       if (my ($where2, $what2) = m|#.*link\s*=\s*(\S+)/(\S+)|) {
+           my $old = "$opts{man1dir}/$what.$opts{man1ext}";
+           my $new = "$opts{man1dir}/$what2.$opts{man1ext}";
+           unlink($new);
+           link($old, $new);
+       }
     }
 }
 
@@ -136,6 +139,7 @@ sub pod2man {
        my $tmp;
        # Skip .pm files that have corresponding .pod files, and Functions.pm.
        next if (($tmp = $mod) =~ s/\.pm$/.pod/ && -f $tmp);
+       next if $mod =~ m:/t/:; # no pods from test directories 
        next if ($manpage eq 'Pod/Functions.pm'); #### Used only by pod itself
 
        # Convert name from  File/Basename.pm to File::Basename.3 format,