diff options
| -rwxr-xr-x | installman | 10 | ||||
| -rw-r--r-- | utils.lst | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/installman b/installman index ced3028dc0..4197a8f325 100755 --- a/installman +++ b/installman @@ -14,7 +14,7 @@ use Pod::Man; use vars qw(%opts $packlist); require './Porting/pod_lib.pl'; -my $state = get_pod_metadata(); +my %man1 = (map {($_->[0], $_->[1])} @{get_pod_metadata()->{master}}); $ENV{SHELL} = 'sh' if $^O eq 'os2'; @@ -64,11 +64,7 @@ $opts{verbose} ||= $opts{V} || $opts{notify}; $packlist = ExtUtils::Packlist->new("$opts{destdir}$Config{installarchlib}/.packlist"); # Install the main pod pages. -pod2man({ - map { - ($_->[0], $_->[1]) - } @{$state->{master}} - }, $opts{man1dir}, $opts{man1ext}, 'pod'); +pod2man(\%man1, $opts{man1dir}, $opts{man1ext}, 'pod'); # Install the pods for library modules. { @@ -85,6 +81,8 @@ while (<UTILS>) { chomp; $_ = $1 if /#.*pod\s*=\s*(\S+)/; my ($path, $leaf) = m|^(\S*/(\S+))|; + # Have we already installed the manpage for this? (ie perldoc) + next if $man1{$leaf}; $leaf =~ s/\.pod\z//; pod2man({$leaf, $path}, $opts{man1dir}, $opts{man1ext}); if ($has_man1dir) { @@ -15,7 +15,7 @@ utils/instmodsh utils/json_pp utils/libnetcfg utils/perlbug # link = utils/perlthanks -utils/perldoc # pod = pod/perldoc.pod +utils/perldoc utils/perlivp utils/piconv utils/pl2pm |