[pull] documentation fixes

[pull] documentation fixes

[Jan Engelhardt]

Please pull from
	git://dev.medozas.de/iptables master

to receive:

	build: trigger reconfigure when extensions/GNUmakefile.in changes
	doc: do not put IPv4 doc into ip6tables.8

[PATCH 1/2] build: trigger reconfigure when extensions/GNUmakefile.in changes

[Jan Engelhardt]

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 Makefile.am |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 41dc280..b8859ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -108,7 +108,8 @@ tarball:
 	tar -C /tmp -cjf ${PACKAGE_TARNAME}-${PACKAGE_VERSION}.tar.bz2 --owner=root --group=root ${PACKAGE_TARNAME}-${PACKAGE_VERSION}/;
 	rm -Rf /tmp/${PACKAGE_TARNAME}-${PACKAGE_VERSION};
 
-config.status: include/xtables.h.in include/iptables/internal.h.in
+config.status: extensions/GNUmakefile.in \
+	include/xtables.h.in include/iptables/internal.h.in
 
 # ldconfig may fail when we are not root (as is the case in build systems)
 # so add appropriate protection that it does not let `make` fail.
-- 
1.6.1.3

[PATCH 2/2] doc: do not put IPv4 doc into ip6tables.8

[Jan Engelhardt]

Reference: http://bugs.debian.org/515752
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 extensions/GNUmakefile.in |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index 1f063c8..256ac08 100644
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -166,13 +166,7 @@ man_run    = \
 			cat "$$f"; \
 			continue; \
 		fi; \
-		f="${srcdir}/libipt_$$ext.man"; \
-		if [ -f "$$f" ]; then \
-			echo ".SS $$ext"; \
-			cat "$$f"; \
-			continue; \
-		fi; \
-		f="${srcdir}/libip6t_$$ext.man"; \
+		f="${srcdir}/lib$(2)t_$$ext.man"; \
 		if [ -f "$$f" ]; then \
 			echo ".SS $$ext"; \
 			cat "$$f"; \
@@ -181,13 +175,13 @@ man_run    = \
 	done >$@;
 
 matches4.man: .initext4.dd $(wildcard ${srcdir}/lib*.man)
-	$(call man_run,$(call ex_matches,${pfx_build_mod} ${pf4_build_mod}))
+	$(call man_run,$(call ex_matches,${pfx_build_mod} ${pf4_build_mod}),ip)
 
 matches6.man: .initext6.dd $(wildcard ${srcdir}/lib*.man)
-	$(call man_run,$(call ex_matches,${pfx_build_mod} ${pf6_build_mod}))
+	$(call man_run,$(call ex_matches,${pfx_build_mod} ${pf6_build_mod}),ip6)
 
 targets4.man: .initext4.dd $(wildcard ${srcdir}/lib*.man)
-	$(call man_run,$(call ex_targets,${pfx_build_mod} ${pf4_build_mod}))
+	$(call man_run,$(call ex_targets,${pfx_build_mod} ${pf4_build_mod}),ip)
 
 targets6.man: .initext6.dd $(wildcard ${srcdir}/lib*.man)
-	$(call man_run,$(call ex_targets,${pfx_build_mod} ${pf6_build_mod}))
+	$(call man_run,$(call ex_targets,${pfx_build_mod} ${pf6_build_mod}),ip6)
-- 
1.6.1.3

Re: [pull] documentation fixes

[Patrick McHardy]

Jan Engelhardt wrote:
> Please pull from
> 	git://dev.medozas.de/iptables master
> 
> to receive:
> 
> 	build: trigger reconfigure when extensions/GNUmakefile.in changes
> 	doc: do not put IPv4 doc into ip6tables.8

Pulled and pushed out, thanks. Please include a full diffstat though,
that saves me from having to add up the individual diffstats manually :)