[netfilter-cvslog] r7296 - in trunk/iptables: . extensions

[kaber at trash.net]

Author: kaber at trash.net
Date: 2008-01-29 14:33:23 +0100 (Tue, 29 Jan 2008)
New Revision: 7296

Modified:
   trunk/iptables/configure.ac
   trunk/iptables/extensions/GNUmakefile.in
Log:
[PATCH]: Build adjustments

A few build system changes.
	* ip6tables needs IP6T_LIB_DIR
	* correctly trigger rebuild of master manpages when
	  submanpages have been touched

Signed-off-by: Jan Engelhardt <jengelh at computergmbh.de.


Modified: trunk/iptables/configure.ac
===================================================================
--- trunk/iptables/configure.ac	2008-01-29 13:32:07 UTC (rev 7295)
+++ trunk/iptables/configure.ac	2008-01-29 13:33:23 UTC (rev 7296)
@@ -40,7 +40,7 @@
 	-D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations \
 	-Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \
 	-Winline -pipe -DIPTABLES_VERSION=\\\"$PACKAGE_VERSION\\\" \
-	-DIPT_LIB_DIR=\\\"\${iptdir}\\\"";
+	-DIPT_LIB_DIR=\\\"\${iptdir}\\\" -DIP6T_LIB_DIR=\\\"\${iptdir}\\\"";
 kinclude_CFLAGS="-I\"$kbuilddir/include\" -I\"$ksourcedir/include\"";
 
 # Remove workarounds soon

Modified: trunk/iptables/extensions/GNUmakefile.in
===================================================================
--- trunk/iptables/extensions/GNUmakefile.in	2008-01-29 13:32:07 UTC (rev 7295)
+++ trunk/iptables/extensions/GNUmakefile.in	2008-01-29 13:33:23 UTC (rev 7296)
@@ -192,14 +192,14 @@
 		fi; \
 	done >$@;
 
-matches4.man: .initext4.dd $(wildcard lib*.man)
+matches4.man: .initext4.dd $(wildcard ${srcdir}/lib*.man)
 	$(call man_run,$(call ex_matches,${pfx_build_mod} ${pf4_build_mod}))
 
-matches6.man: .initext6.dd $(wildcard lib*.man)
+matches6.man: .initext6.dd $(wildcard ${srcdir}/lib*.man)
 	$(call man_run,$(call ex_matches,${pfx_build_mod} ${pf6_build_mod}))
 
-targets4.man: .initext4.dd $(wildcard lib*.man)
+targets4.man: .initext4.dd $(wildcard ${srcdir}/lib*.man)
 	$(call man_run,$(call ex_targets,${pfx_build_mod} ${pf4_build_mod}))
 
-targets6.man: .initext6.dd $(wildcard lib*.man)
+targets6.man: .initext6.dd $(wildcard ${srcdir}/lib*.man)
 	$(call man_run,$(call ex_targets,${pfx_build_mod} ${pf6_build_mod}))