doc: switch to man(1) for pod => (text|html)

pod2text(1) will wrap long .onion URLs and cause resulting HTML
to be linkified improperly.

diff --git a/Documentation/include.mk b/Documentation/include.mk
index af5f7f24df718740c747fb6959db5cb927021b12..bfbc495f0470cff4e88131f596e494f7335d21c6 100644 (file)
--- a/Documentation/include.mk
+++ b/Documentation/include.mk
@@ -14,17 +14,13 @@ XMLSTARLET = xmlstarlet
 # libgraph-easy-perl from Debian, Graph::Easy from CPAN
 GRAPH_EASY = graph-easy
 
-# same as pod2text
-COLUMNS = 76
-
 INSTALL = install
 PODMAN = pod2man
 PODMAN_OPTS = -v --stderr -d 1993-10-02 -c 'public-inbox user manual'
 PODMAN_OPTS += -r public-inbox.git
 podman = $(PODMAN) $(PODMAN_OPTS)
-PODTEXT = pod2text
-PODTEXT_OPTS = --stderr
-podtext = $(PODTEXT) $(PODTEXT_OPTS)
+
+man2text = COLUMNS=80 MANWIDTH=80 TERM=dumb MANOPT='--nj --nh' man
 
 all:: man
 

diff --git a/Makefile.PL b/Makefile.PL
index b7851adae152fe32bde3ac8658b8b9f6c2002dac..fffe30e93181e86cac02c0809c6dab3f8c78f1e5 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -72,7 +72,7 @@ for my $i (@sections) {
                my $pod = "Documentation/$m.pod";
                my $txt = "Documentation/$m.txt";
                $t->{"$m.$i : $pod"} = [ "\$(podman) -s$i $pod \$@" ];
-               $t->{"$txt : $pod"} = [ "\$(podtext) $pod \$\@+",
+               $t->{"$txt : $m.$i"} = [ "\$(man2text) ./$m.$i >\$\@+",
                                        "touch -r $pod \$\@+",
                                        "mv \$\@+ \$@" ];
                $t->{"Documentation/$m.html : $txt"} = [ "\$(txt2pre) <$txt" ];