From: Eric Wong <e@80x24.org>
Date: Tue, 4 May 2021 04:15:44 +0000 (+0000)
Subject: doc: ignore onion URLs for 80-column check
X-Git-Tag: v1.7.0~695
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=eb99e6d0a50ba2e03870b21b165e37a64ce745bd;p=public-inbox.git

doc: ignore onion URLs for 80-column check

This failure was also passing under FreeBSD make + /bin/sh;
so we also avoid the '&&' chain is avoided and use '>$@' as a
separate line in the Makefile.
---

diff --git a/Documentation/include.mk b/Documentation/include.mk
index 79bf460d..5f3ffcc5 100644
--- a/Documentation/include.mk
+++ b/Documentation/include.mk
@@ -52,8 +52,9 @@ install-man: man
 doc_install :: install-man
 
 check :: check-man
-check_man = $(AWK) '{gsub(/\b./,"")}length>80{print;err=1}END{exit(err)}'\
-	>&2 && >$@
+check_man = $(AWK) \
+	'{gsub(/\b./,"")}$$0 !~ /\.onion/&&length>80{print;e=1}END{exit(e)}' \
+	>&2
 
 check-man :: $(check_80)
 
diff --git a/Makefile.PL b/Makefile.PL
index 85b18e7d..401c033e 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -72,7 +72,8 @@ for my $i (@sections) {
 		$t->{"Documentation/$m.html : $txt"} = [ "\$(txt2pre) <$txt" ];
 		$t->{".$m.cols : $m.$i"} = [
 			"\@echo CHECK80 $m.$i;".
-			"COLUMNS=80 \$(MAN) ./$m.$i | \$(check_man)" ];
+			"COLUMNS=80 \$(MAN) ./$m.$i | \$(check_man)",
+			'>$@' ];
 		$t->{".$m.lexgrog: $m.$i"} = [
 			"\@echo LEXGROG $m.$i;" .
 			"\$(LEXGROG) ./$m.$i >\$\@+ && mv \$\@+ \$@" ];