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 e616329775fba351d7c27bb4ae1d72040ea071a1..b90c4a7079b2a65704fb8977e25e3da290e3df76 100644 (file)
--- 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 1521a3300704da76d9902ee31726451e85a38824..155703d86b3f8b8bd1b23995aadbff9bb2280308 100644 (file)
--- 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}))