From: Jan Engelhardt <jengelh@medozas.de>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH 4/5] build: fix manpage collection
Date: Mon, 1 Jun 2009 12:06:32 +0200 [thread overview]
Message-ID: <1243850793-9526-5-git-send-email-jengelh@medozas.de> (raw)
In-Reply-To: <1243850793-9526-1-git-send-email-jengelh@medozas.de>
Florian Westphal points out that v1.4.3.2-9-gc304d77 greps for the
keyword in the wrong file, and that files with NFPROTO_UNSPEC are
skipped.
This patch corrects that part, and makes `make` now output the
manpages it collected.
Reported-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
extensions/GNUmakefile.in | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index 8d7f21d..e1f1f49 100644
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -161,13 +161,16 @@ man_run = \
${AM_VERBOSE_GEN} \
for ext in $(1); do \
f="${srcdir}/libxt_$$ext.man"; \
- if [ -f "$$f" ] && grep -q "$(3)" "$$f"; then \
+ cf="${srcdir}/libxt_$$ext.c"; \
+ if [ -f "$$f" ] && grep -Eq "$(3)|NFPROTO_UNSPEC" "$$cf"; then \
+ echo -e "\t+ $$f" >&2; \
echo ".SS $$ext"; \
cat "$$f"; \
continue; \
fi; \
f="${srcdir}/lib$(2)t_$$ext.man"; \
if [ -f "$$f" ]; then \
+ echo -e "\t+ $$f" >&2; \
echo ".SS $$ext"; \
cat "$$f"; \
continue; \
--
1.6.3.1
next prev parent reply other threads:[~2009-06-01 10:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-01 10:06 pull for iptables Jan Engelhardt
2009-06-01 10:06 ` [PATCH 1/5] libip6t_policy: remove redundant functions Jan Engelhardt
2009-06-01 10:06 ` [PATCH 2/5] policy: use direct xt_policy_info instead of ipt/ip6t Jan Engelhardt
2009-06-01 10:06 ` [PATCH 3/5] policy: merge ipv6 and ipv4 variant Jan Engelhardt
2009-06-01 10:06 ` Jan Engelhardt [this message]
2009-06-01 10:06 ` [PATCH 5/5] extensions: use NFPROTO_UNSPEC for .family field 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=1243850793-9526-5-git-send-email-jengelh@medozas.de \
--to=jengelh@medozas.de \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).