All of lore.kernel.org
 help / color / mirror / Atom feed
From: Florian Westphal <fw@strlen.de>
To: netfilter-devel@vger.kernel.org
Cc: Florian Westphal <fw@strlen.de>
Subject: [PATCH] fix "manpages: do not include v4-only modules in ip6tables manpage"
Date: Sun, 31 May 2009 18:50:16 +0200	[thread overview]
Message-ID: <1243788616-375-1-git-send-email-fw@strlen.de> (raw)

previous commit tries to skip v4-only module manpages
by searching for NFPROTO_IPV(4|6) -- in the man page itself.

Searching the .c file instead is not sufficient:
- there is at least one page (libxt_policy) without a libxt_*c
- there are targets/modules which use family AF_UNSPEC.

Signed-off-by: Florian Westphal <fw@strlen.de>
---
 extensions/GNUmakefile.in |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index 8d7f21d..44a6d02 100644
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -161,10 +161,13 @@ man_run    = \
 	${AM_VERBOSE_GEN} \
 	for ext in $(1); do \
 		f="${srcdir}/libxt_$$ext.man"; \
-		if [ -f "$$f" ] && grep -q "$(3)" "$$f"; then \
-			echo ".SS $$ext"; \
-			cat "$$f"; \
-			continue; \
+		if [ -f "$$f" ] ; then \
+			cfile="${srcdir}/libxt_$$ext.c"; \
+			if [ ! -f "$$cfile" ] || grep -q "\(_UNSPEC\|$(3)\)" "$$cfile"; then \
+				echo ".SS $$ext"; \
+				cat "$$f"; \
+				continue; \
+			fi; \
 		fi; \
 		f="${srcdir}/lib$(2)t_$$ext.man"; \
 		if [ -f "$$f" ]; then \
-- 
1.6.0.6


             reply	other threads:[~2009-05-31 16:45 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-31 16:50 Florian Westphal [this message]
2009-05-31 20:24 ` [PATCH] fix "manpages: do not include v4-only modules in ip6tables manpage" Jan Engelhardt
2009-06-01  8:58   ` Pablo Neira Ayuso
2009-06-01  9:49     ` Jan Engelhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1243788616-375-1-git-send-email-fw@strlen.de \
    --to=fw@strlen.de \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.