From 98ef27178aa080d3e796ec65e75072efcf4f4156 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 20 Mar 2008 04:18:39 +0000
Subject: [PATCH] 2341.   [bug]           libbind: add missing -I../include for
 off source                         tree builds. [RT #17606]

---
 CHANGES                      | 3 +++
 lib/bind/bsd/Makefile.in     | 4 ++--
 lib/bind/dst/Makefile.in     | 4 ++--
 lib/bind/inet/Makefile.in    | 4 ++--
 lib/bind/irs/Makefile.in     | 4 ++--
 lib/bind/isc/Makefile.in     | 4 ++--
 lib/bind/nameser/Makefile.in | 4 ++--
 lib/bind/resolv/Makefile.in  | 4 ++--
 8 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/CHANGES b/CHANGES
index ac872ae3a7..43f2ccb1c3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2341.	[bug]		libbind: add missing -I../include for off source
+			tree builds. [RT #17606]
+
 2340.	[port]		openbsd: interface configuration. [RT #17700]
 
 2339.	[port]		tru64: support for libbind. [RT #17589]
diff --git a/lib/bind/bsd/Makefile.in b/lib/bind/bsd/Makefile.in
index 3cbd7763fa..f392e47282 100644
--- a/lib/bind/bsd/Makefile.in
+++ b/lib/bind/bsd/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.9 2007/06/19 23:47:13 tbox Exp $
+# $Id: Makefile.in,v 1.9.128.1 2008/03/20 04:18:39 marka Exp $
 
 srcdir=         @srcdir@
 VPATH =         @srcdir@
@@ -34,6 +34,6 @@ SRCS=	daemon.c ftruncate.c gettimeofday.c mktemp.c putenv.c \
 
 TARGETS= ${OBJS}
 
-CINCLUDES= -I.. -I${srcdir}/../include
+CINCLUDES= -I.. -I../include -I${srcdir}/../include
 
 @BIND9_MAKE_RULES@
diff --git a/lib/bind/dst/Makefile.in b/lib/bind/dst/Makefile.in
index 2cb10cf6eb..a37e365386 100644
--- a/lib/bind/dst/Makefile.in
+++ b/lib/bind/dst/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.8 2007/06/19 23:47:13 tbox Exp $
+# $Id: Makefile.in,v 1.8.128.1 2008/03/20 04:18:39 marka Exp $
  
 srcdir=		@srcdir@
 VPATH =         @srcdir@
@@ -26,7 +26,7 @@ TARGETS= ${OBJS}
 
 CRYPTFLAGS=     -DCYLINK_DSS -DHMAC_MD5 -DUSE_MD5 -DDNSSAFE
 
-CINCLUDES= -I.. -I${srcdir}/../include ${CRYPTINCL}
+CINCLUDES= -I.. -I../include -I${srcdir}/../include ${CRYPTINCL}
 CDEFINES= ${CRYPTFLAGS}
 
 @BIND9_MAKE_RULES@
diff --git a/lib/bind/inet/Makefile.in b/lib/bind/inet/Makefile.in
index bd5d352d7f..41444a8492 100644
--- a/lib/bind/inet/Makefile.in
+++ b/lib/bind/inet/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.7 2007/06/19 23:47:13 tbox Exp $
+# $Id: Makefile.in,v 1.7.128.1 2008/03/20 04:18:39 marka Exp $
 
 srcdir=		@srcdir@
 VPATH =         @srcdir@
@@ -30,6 +30,6 @@ SRCS=	inet_addr.c inet_cidr_ntop.c inet_cidr_pton.c inet_data.c \
 
 TARGETS= ${OBJS}
 
-CINCLUDES= -I.. -I${srcdir}/../include
+CINCLUDES= -I.. -I../include -I${srcdir}/../include
 
 @BIND9_MAKE_RULES@
diff --git a/lib/bind/irs/Makefile.in b/lib/bind/irs/Makefile.in
index d5b73405d5..21b049b955 100644
--- a/lib/bind/irs/Makefile.in
+++ b/lib/bind/irs/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.12 2007/06/19 23:47:13 tbox Exp $
+# $Id: Makefile.in,v 1.12.128.1 2008/03/20 04:18:39 marka Exp $
 
 srcdir=		@srcdir@
 VPATH =         @srcdir@
@@ -65,6 +65,6 @@ WANT_IRS_THREADSGR_OBJS=getgrent_r.@O@
 
 TARGETS= ${OBJS}
 
-CINCLUDES= -I.. -I${srcdir}/../include
+CINCLUDES= -I.. -I../include -I${srcdir}/../include
 
 @BIND9_MAKE_RULES@
diff --git a/lib/bind/isc/Makefile.in b/lib/bind/isc/Makefile.in
index dcd0248759..680165e269 100644
--- a/lib/bind/isc/Makefile.in
+++ b/lib/bind/isc/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.9 2007/06/19 23:47:13 tbox Exp $
+# $Id: Makefile.in,v 1.9.128.1 2008/03/20 04:18:39 marka Exp $
 
 srcdir=		@srcdir@
 VPATH =         @srcdir@
@@ -30,6 +30,6 @@ SRCS=	assertions.c base64.c bitncmp.c ctl_clnt.c ctl_p.c \
 
 TARGETS= ${OBJS}
 
-CINCLUDES= -I.. -I${srcdir}/../include
+CINCLUDES= -I.. -I../include -I${srcdir}/../include
 
 @BIND9_MAKE_RULES@
diff --git a/lib/bind/nameser/Makefile.in b/lib/bind/nameser/Makefile.in
index 86365265b5..3406d74470 100644
--- a/lib/bind/nameser/Makefile.in
+++ b/lib/bind/nameser/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.7 2007/06/19 23:47:13 tbox Exp $
+# $Id: Makefile.in,v 1.7.128.1 2008/03/20 04:18:39 marka Exp $
 
 srcdir=		@srcdir@
 VPATH =         @srcdir@
@@ -26,6 +26,6 @@ SRCS=	ns_date.c ns_name.c ns_netint.c ns_parse.c ns_print.c \
 
 TARGETS= ${OBJS}
 
-CINCLUDES= -I.. -I${srcdir}/../include
+CINCLUDES= -I.. -I../include -I${srcdir}/../include
 
 @BIND9_MAKE_RULES@
diff --git a/lib/bind/resolv/Makefile.in b/lib/bind/resolv/Makefile.in
index d5bbb67482..e65421f9f4 100644
--- a/lib/bind/resolv/Makefile.in
+++ b/lib/bind/resolv/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.8 2007/06/19 23:47:16 tbox Exp $
+# $Id: Makefile.in,v 1.8.128.1 2008/03/20 04:18:39 marka Exp $
 
 srcdir=		@srcdir@
 VPATH =         @srcdir@
@@ -28,7 +28,7 @@ SRCS=	herror.c mtctxres.c res_comp.c res_data.c res_debug.c \
 
 TARGETS= ${OBJS}
 
-CINCLUDES= -I.. -I${srcdir}/../include
+CINCLUDES= -I.. -I../include -I${srcdir}/../include
 CWARNINGS=
 
 @BIND9_MAKE_RULES@