From 7249c2ac6493849739ea7c1ad5265cff421e2869 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 3 Nov 2021 21:01:22 +0000 Subject: [PATCH] doc: switch to man(1) for pod => (text|html) pod2text(1) will wrap long .onion URLs and cause resulting HTML to be linkified improperly. --- Documentation/include.mk | 8 ++------ Makefile.PL | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Documentation/include.mk b/Documentation/include.mk index af5f7f24..bfbc495f 100644 --- 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 b7851ada..fffe30e9 100644 --- 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" ]; -- 2.44.0