From: Francis Dupont <fdupont@isc.org>
Date: Mon, 16 Nov 2015 14:14:05 +0000 (+0100)
Subject: Addressed comments. Required regen
X-Git-Tag: v4_3_4~53^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79bce3a51d1cc41f1bafa52bd16698cd5b73d570;p=thirdparty%2Fdhcp.git

Addressed comments. Required regen
---

diff --git a/client/tests/Makefile.am b/client/tests/Makefile.am
index c07c504a9..77fb4dace 100644
--- a/client/tests/Makefile.am
+++ b/client/tests/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = .
 BINDLIBDIR = @BINDDIR@/lib
 
 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
-AM_CPPFLAGS += -I$(top_srcdir)/bind/include -I$(top_srcdir)
+AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir)
 AM_CPPFLAGS += -DLOCALSTATEDIR='"."'
 AM_CPPFLAGS += -DCLIENT_PATH='"."'
 
diff --git a/configure.ac b/configure.ac
index a5937ac81..924fc9d41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -611,6 +611,8 @@ no)
 	BINDDIR="$use_libbind"
 	if test ! -d "bind"; then
 		# no bind directory, create it with a fake Makefile.in
+		# (AC_CONFIG_FILES and top Makefile refer to it so
+		# it must exits)
 		mkdir bind
 		cat > bind/Makefile.in << EOF
 # placeholder
diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
index 1d176af07..0353c6475 100644
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = .
 BINDLIBDIR = @BINDDIR@/lib
 
 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
-AM_CPPFLAGS += -I$(top_srcdir)/bind/include -I$(top_srcdir)
+AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir)
 AM_CPPFLAGS += -DLOCALSTATEDIR='"."'
 
 EXTRA_DIST = Atffile