From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Sat, 26 Jun 2004 17:06:36 +0000 (+0000)
Subject: Move include path work for named related utilities.
X-Git-Tag: v2.0.1~10977
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/c2768fcb4146c8659dcd6922b0c1e97a81a2fbc5

Move include path work for named related utilities.
---

diff --git a/usr.bin/dig/Makefile b/usr.bin/dig/Makefile
index 1433cfacef..fbd3985f65 100644
--- a/usr.bin/dig/Makefile
+++ b/usr.bin/dig/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/usr.bin/dig/Makefile,v 1.7 1999/11/30 06:25:16 peter Exp $
-# $DragonFly: src/usr.bin/dig/Makefile,v 1.3 2004/05/27 18:15:41 dillon Exp $
+# $DragonFly: src/usr.bin/dig/Makefile,v 1.4 2004/06/26 17:06:32 dillon Exp $
 
 USE_LIBBIND=	yes
 USE_LIBISC=	yes
@@ -12,6 +12,7 @@ PROG=	dig
 SRCS=	dig.c dighost.c
 
 CFLAGS+= -I${.CURDIR}/../../usr.sbin/named \
+	-I${.CURDIR}/../../usr.sbin/named/include \
 	-I${BIND_DIR}/bin/dig/include
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/dnssec-keygen/Makefile b/usr.bin/dnssec-keygen/Makefile
index afc5ec4b88..e1b1122336 100644
--- a/usr.bin/dnssec-keygen/Makefile
+++ b/usr.bin/dnssec-keygen/Makefile
@@ -1,5 +1,5 @@
 #
-# $DragonFly: src/usr.bin/dnssec-keygen/Makefile,v 1.1 2004/05/27 18:15:41 dillon Exp $
+# $DragonFly: src/usr.bin/dnssec-keygen/Makefile,v 1.2 2004/06/26 17:06:34 dillon Exp $
 
 USE_LIBBIND=	yes
 USE_LIBISC=	yes
@@ -11,6 +11,7 @@ PROG=	dnssec-keygen
 SRCS=	dnssec-keygen.c dnssectool.c
 MAN=	dnssec-keygen.8
 
-CFLAGS+= -I${.CURDIR}/../../usr.sbin/named
+CFLAGS+= -I${.CURDIR}/../../usr.sbin/named \
+	-I${.CURDIR}/../../usr.sbin/named/include
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/dnssec-makekeyset/Makefile b/usr.bin/dnssec-makekeyset/Makefile
index 18c92cc62c..133ea40ce0 100644
--- a/usr.bin/dnssec-makekeyset/Makefile
+++ b/usr.bin/dnssec-makekeyset/Makefile
@@ -1,5 +1,5 @@
 #
-# $DragonFly: src/usr.bin/dnssec-makekeyset/Attic/Makefile,v 1.1 2004/05/27 18:15:41 dillon Exp $
+# $DragonFly: src/usr.bin/dnssec-makekeyset/Attic/Makefile,v 1.2 2004/06/26 17:06:35 dillon Exp $
 
 USE_LIBBIND=	yes
 USE_LIBISC=	yes
@@ -11,6 +11,7 @@ PROG=	dnssec-makekeyset
 SRCS=	dnssec-makekeyset.c dnssectool.c
 MAN=	dnssec-makekeyset.8
 
-CFLAGS+= -I${.CURDIR}/../../usr.sbin/named
+CFLAGS+= -I${.CURDIR}/../../usr.sbin/named \
+	-I${.CURDIR}/../../usr.sbin/named/include
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/dnssec-signkey/Makefile b/usr.bin/dnssec-signkey/Makefile
index fc3a51742c..cd72f8d9b1 100644
--- a/usr.bin/dnssec-signkey/Makefile
+++ b/usr.bin/dnssec-signkey/Makefile
@@ -1,5 +1,5 @@
 #
-# $DragonFly: src/usr.bin/dnssec-signkey/Attic/Makefile,v 1.1 2004/05/27 18:15:42 dillon Exp $
+# $DragonFly: src/usr.bin/dnssec-signkey/Attic/Makefile,v 1.2 2004/06/26 17:06:35 dillon Exp $
 
 USE_LIBBIND=	yes
 USE_LIBISC=	yes
@@ -11,6 +11,7 @@ PROG=	dnssec-signkey
 SRCS=	dnssec-signkey.c dnssectool.c
 MAN=	dnssec-signkey.8
 
-CFLAGS+= -I${.CURDIR}/../../usr.sbin/named
+CFLAGS+= -I${.CURDIR}/../../usr.sbin/named \
+	-I${.CURDIR}/../../usr.sbin/named/include
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/dnssec-signzone/Makefile b/usr.bin/dnssec-signzone/Makefile
index 57922fb22b..83da90a107 100644
--- a/usr.bin/dnssec-signzone/Makefile
+++ b/usr.bin/dnssec-signzone/Makefile
@@ -1,5 +1,5 @@
 #
-# $DragonFly: src/usr.bin/dnssec-signzone/Makefile,v 1.1 2004/05/27 18:15:42 dillon Exp $
+# $DragonFly: src/usr.bin/dnssec-signzone/Makefile,v 1.2 2004/06/26 17:06:35 dillon Exp $
 
 USE_LIBBIND=	yes
 USE_LIBISC=	yes
@@ -11,6 +11,7 @@ PROG=	dnssec-signzone
 SRCS=	dnssec-signzone.c dnssectool.c
 MAN=	dnssec-signzone.8
 
-CFLAGS+= -I${.CURDIR}/../../usr.sbin/named
+CFLAGS+= -I${.CURDIR}/../../usr.sbin/named \
+	-I${.CURDIR}/../../usr.sbin/named/include
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/host/Makefile b/usr.bin/host/Makefile
index 795e365ca7..9a0e8b8c94 100644
--- a/usr.bin/host/Makefile
+++ b/usr.bin/host/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/usr.bin/dig/Makefile,v 1.7 1999/11/30 06:25:16 peter Exp $
-# $DragonFly: src/usr.bin/host/Makefile,v 1.3 2004/05/27 18:15:42 dillon Exp $
+# $DragonFly: src/usr.bin/host/Makefile,v 1.4 2004/06/26 17:06:35 dillon Exp $
 
 USE_LIBBIND=	yes
 USE_LIBISC=	yes
@@ -12,6 +12,7 @@ PROG=	host
 SRCS=	host.c dighost.c
 
 CFLAGS+= -I${.CURDIR}/../../usr.sbin/named \
+	-I${.CURDIR}/../../usr.sbin/named/include \
 	-I${BIND_DIR}/bin/dig/include
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/named-checkconf/Makefile b/usr.sbin/named-checkconf/Makefile
index 4478c87025..d808ac62b7 100644
--- a/usr.sbin/named-checkconf/Makefile
+++ b/usr.sbin/named-checkconf/Makefile
@@ -1,5 +1,5 @@
 #
-# $DragonFly: src/usr.sbin/named-checkconf/Makefile,v 1.1 2004/05/27 18:15:43 dillon Exp $
+# $DragonFly: src/usr.sbin/named-checkconf/Makefile,v 1.2 2004/06/26 17:06:35 dillon Exp $
 
 USE_LIBBIND=	yes
 USE_LIBISC=	yes
@@ -12,6 +12,7 @@ SRCS=	named-checkconf.c check-tool.c
 MAN=	named-checkconf.8
 
 CFLAGS+= -I${.CURDIR}/../../usr.sbin/named \
+	-I${.CURDIR}/../../usr.sbin/named/include \
 	-I${BIND_DIR}/bin/check \
 	-DNAMED_CONFFILE=\"${DESTETC}/named.conf\"
 
diff --git a/usr.sbin/named-checkzone/Makefile b/usr.sbin/named-checkzone/Makefile
index 6a0d044304..0a05af399e 100644
--- a/usr.sbin/named-checkzone/Makefile
+++ b/usr.sbin/named-checkzone/Makefile
@@ -1,5 +1,5 @@
 #
-# $DragonFly: src/usr.sbin/named-checkzone/Makefile,v 1.1 2004/05/27 18:15:43 dillon Exp $
+# $DragonFly: src/usr.sbin/named-checkzone/Makefile,v 1.2 2004/06/26 17:06:36 dillon Exp $
 
 USE_LIBBIND=	yes
 USE_LIBISC=	yes
@@ -12,6 +12,7 @@ SRCS=	named-checkzone.c check-tool.c
 MAN=	named-checkzone.8
 
 CFLAGS+= -I${.CURDIR}/../../usr.sbin/named \
+	-I${.CURDIR}/../../usr.sbin/named/include \
 	-I${BIND_DIR}/bin/check \
 	-DNAMED_CONFFILE=\"${DESTETC}/named.conf\"
 
diff --git a/usr.sbin/nslookup/Makefile b/usr.sbin/nslookup/Makefile
index 3d345f3b83..d6ae567f4e 100644
--- a/usr.sbin/nslookup/Makefile
+++ b/usr.sbin/nslookup/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/usr.bin/dig/Makefile,v 1.7 1999/11/30 06:25:16 peter Exp $
-# $DragonFly: src/usr.sbin/nslookup/Makefile,v 1.4 2004/05/27 18:15:43 dillon Exp $
+# $DragonFly: src/usr.sbin/nslookup/Makefile,v 1.5 2004/06/26 17:06:36 dillon Exp $
 
 USE_LIBBIND=	yes
 USE_LIBISC=	yes
@@ -13,6 +13,7 @@ SRCS=	nslookup.c dighost.c
 MAN=
 
 CFLAGS+= -I${.CURDIR}/../../usr.sbin/named \
+	-I${.CURDIR}/../../usr.sbin/named/include \
 	-I${BIND_DIR}/bin/dig/include
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/nsupdate/Makefile b/usr.sbin/nsupdate/Makefile
index 407d8dcedb..fed264e37f 100644
--- a/usr.sbin/nsupdate/Makefile
+++ b/usr.sbin/nsupdate/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/usr.bin/dig/Makefile,v 1.7 1999/11/30 06:25:16 peter Exp $
-# $DragonFly: src/usr.sbin/nsupdate/Makefile,v 1.3 2004/05/27 18:15:43 dillon Exp $
+# $DragonFly: src/usr.sbin/nsupdate/Makefile,v 1.4 2004/06/26 17:06:36 dillon Exp $
 
 USE_LIBBIND=	yes
 USE_LIBISC=	yes
@@ -11,7 +11,9 @@ USE_LIBISC=	yes
 PROG=	nsupdate
 SRCS=	nsupdate.c
 
-CFLAGS+= -I${.CURDIR}/../../usr.sbin/named
+CFLAGS+= -I${.CURDIR}/../../usr.sbin/named \
+	-I${.CURDIR}/../../usr.sbin/named/include
+
 MAN= nsupdate.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/rndc-confgen/Makefile b/usr.sbin/rndc-confgen/Makefile
index a7a3403939..4a692b7b70 100644
--- a/usr.sbin/rndc-confgen/Makefile
+++ b/usr.sbin/rndc-confgen/Makefile
@@ -1,5 +1,5 @@
 #
-# $DragonFly: src/usr.sbin/rndc-confgen/Makefile,v 1.1 2004/05/27 18:15:43 dillon Exp $
+# $DragonFly: src/usr.sbin/rndc-confgen/Makefile,v 1.2 2004/06/26 17:06:36 dillon Exp $
 
 USE_LIBBIND=	yes
 USE_LIBISC=	yes
@@ -13,6 +13,7 @@ SRCS=	rndc-confgen.c os.c util.c
 MAN=	rndc-confgen.8
 
 CFLAGS+= -I${.CURDIR}/../../usr.sbin/named \
+	-I${.CURDIR}/../../usr.sbin/named/include \
 	-I${BIND_DIR}/bin/rndc/include \
 	-DRNDC_CONFFILE=\"${DESTETC}/rndc.conf\" \
 	-DRNDC_KEYFILE=\"${DESTETC}/rndc.key\"
diff --git a/usr.sbin/rndc/Makefile b/usr.sbin/rndc/Makefile
index b188d86328..398ba37cce 100644
--- a/usr.sbin/rndc/Makefile
+++ b/usr.sbin/rndc/Makefile
@@ -1,5 +1,5 @@
 #
-# $DragonFly: src/usr.sbin/rndc/Makefile,v 1.1 2004/05/27 18:15:43 dillon Exp $
+# $DragonFly: src/usr.sbin/rndc/Makefile,v 1.2 2004/06/26 17:06:36 dillon Exp $
 
 USE_LIBBIND=	yes
 USE_LIBISC=	yes
@@ -13,6 +13,7 @@ SRCS=	rndc.c os.c util.c
 MAN=	rndc.8
 
 CFLAGS+= -I${.CURDIR}/../../usr.sbin/named \
+	-I${.CURDIR}/../../usr.sbin/named/include \
 	-I${BIND_DIR}/bin/rndc/include \
 	-DRNDC_CONFFILE=\"${DESTETC}/rndc.conf\" \
 	-DRNDC_KEYFILE=\"${DESTETC}/rndc.key\"