Add x2p/a2p.pod to the 'master' array returned by get_pod_metadata().

This makes installman install it correctly. Flagging it as 'toc_omit' means
that everything else ignores it. This eliminates the last remaining use of the
"pod =" feature of utils.lst, permitting related code to be removed from
installperl and installman.

This change has the possibly unfortunate cosmetic side effect of installman
now installing a2p.1 first, before perl.1

diff --git a/Porting/pod_lib.pl b/Porting/pod_lib.pl
index 94cf026..c86993d 100644 (file)
--- a/Porting/pod_lib.pl
+++ b/Porting/pod_lib.pl
@@ -216,6 +216,8 @@ sub __prime_state {
         }
     }
     close $master or my_die("close pod/perl.pod: $!");
+    # This has to be special-cased somewhere. Turns out this is cleanest:
+    push @{$state{master}}, ['a2p', 'x2p/a2p.pod', {toc_omit => 1}];
 
     my_die("perl.pod sets flags for unknown pods: "
            . join ' ', sort keys %flag_set)

diff --git a/installman b/installman
index 4197a8f..f8e00e5 100755 (executable)
--- a/installman
+++ b/installman
@@ -79,11 +79,9 @@ open UTILS, "utils.lst" or die "Can't open 'utils.lst': $!";
 while (<UTILS>) {
     next if /^#/;
     chomp;
-    $_ = $1 if /#.*pod\s*=\s*(\S+)/;
     my ($path, $leaf) = m|^(\S*/(\S+))|;
-    # Have we already installed the manpage for this? (ie perldoc)
+    # Have we already installed the manpage for this? (eg perldoc, a2p)
     next if $man1{$leaf};
-    $leaf =~ s/\.pod\z//;
     pod2man({$leaf, $path}, $opts{man1dir}, $opts{man1ext});
     if ($has_man1dir) {
         if (my ($link) = m|#.*link\s*=\s*\S+/(\S+)|) {

diff --git a/installperl b/installperl
index a67cd6d..67e17da 100755 (executable)
--- a/installperl
+++ b/installperl
@@ -116,7 +116,6 @@ my (@scripts, @tolink);
 open SCRIPTS, "utils.lst" or die "Can't open utils.lst: $!";
 while (<SCRIPTS>) {
     next if /^#/;
-    s/\s*#\s*pod\s*=.*//; # install script regardless of pod location
     next if /a2p/; # a2p is binary, to be installed separately
     chomp;
     if (/(\S*)\s*#\s*link\s*=\s*(\S*)/) {

diff --git a/utils.lst b/utils.lst
index 9f39fb9..99b85be 100644 (file)
--- a/utils.lst
+++ b/utils.lst
@@ -31,6 +31,6 @@ utils/shasum
 utils/splain
 utils/xsubpp
 utils/zipdetails
-x2p/a2p         # pod = x2p/a2p.pod
+x2p/a2p
 x2p/find2perl
 x2p/s2p         # link = x2p/psed