[patch] iptables-1.4.11.1: Fix man page generation

[patch] iptables-1.4.11.1: Fix man page generation

[Peter Volkov]

[-- Attachment #1: Type: text/plain, Size: 151 bytes --]

Hi! Generated iptables and ip6tables man pages miss extensions
documentation. This patch aims to fix that. Please apply.

With best regards,
--
Peter.

[-- Attachment #2: 0001-Fix-manpage-generation-add-extensions-documentation.patch --]
[-- Type: text/x-patch, Size: 1593 bytes --]

>From 2ca070d86813d143a004e41f5e37d0146372a573 Mon Sep 17 00:00:00 2001
From: Peter Volkov <pva@gentoo.org>
Date: Thu, 16 Jun 2011 15:09:21 +0400
Subject: [PATCH] Fix manpage generation add extensions documentation

Due to typo generated ip{,6}tables manpages do not include documentation
from extensions directory. Fix this.
---
 iptables/Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/iptables/Makefile.am b/iptables/Makefile.am
index 13cca9c..a068278 100644
--- a/iptables/Makefile.am
+++ b/iptables/Makefile.am
@@ -51,10 +51,10 @@ v6_sbin_links  = ip6tables ip6tables-restore ip6tables-save
 endif
 
 iptables.8: ${srcdir}/iptables.8.in ../extensions/matches4.man ../extensions/targets4.man
-	${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r extensions/matches4.man' -e '/@TARGET@/ r extensions/targets4.man' $< >$@;
+	${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r ../extensions/matches4.man' -e '/@TARGET@/ r ../extensions/targets4.man' $< >$@;
 
 ip6tables.8: ${srcdir}/ip6tables.8.in ../extensions/matches6.man ../extensions/targets6.man
-	${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r extensions/matches6.man' -e '/@TARGET@/ r extensions/targets6.man' $< >$@;
+	${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r ../extensions/matches6.man' -e '/@TARGET@/ r ../extensions/targets6.man' $< >$@;
 
 pkgconfig_DATA = xtables.pc
 
-- 
1.7.3.4

Re: [patch] iptables-1.4.11.1: Fix man page generation

[Jan Engelhardt]

On Thursday 2011-06-16 13:20, Peter Volkov wrote:

>Hi! Generated iptables and ip6tables man pages miss extensions
>documentation. This patch aims to fix that. Please apply.

Already submitted earlier:
http://marc.info/?l=netfilter-devel&m=130762619021616&w=2