From: Jan Engelhardt <jengelh@medozas.de>
Date: Tue, 29 Jan 2008 13:33:23 +0000 (+0000)
Subject: Build adjustments
X-Git-Tag: v1.4.1-rc1~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a99cb4444ceff1b0029c7e25b0714dbee9021b12;p=thirdparty%2Fiptables.git

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@computergmbh.de.
---

diff --git a/configure.ac b/configure.ac
index e6163297..b90c4a70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ regular_CFLAGS="-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES -D_FILE_OFFSET_BITS=64 \
 	-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
diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index 1521a330..155703d8 100644
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -192,14 +192,14 @@ man_run    = \
 		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}))