1. Add much finer granularity to the NO_BIND knobs with the addition of:

NO_BIND_DNSSEC, NO_BIND_ETC, NO_BIND_NAMED, and NO_BIND_UTILS.

2. Make creation of directories in /usr/include that are only needed
in the WITH_BIND_LIBS case conditional.

Reviewed by:	ru, des

1 files changed, 14 insertions, 0 deletions

diff --git a/etc/Makefile b/etc/Makefile
index e7cea56..aec71ff 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -40,9 +40,17 @@ MTREE=	BSD.include.dist BSD.local.dist BSD.root.dist BSD.usr.dist \
 .if !defined(NO_SENDMAIL)
 MTREE+=	BSD.sendmail.dist
 .endif
+.if !defined(NO_BIND)
+MTREE+=	BIND.chroot.dist
+.if defined(WITH_BIND_LIBS)
+MTREE+=	BIND.include.dist
+.endif
+.endif
 
+.if !defined(NO_BIND_ETC) && !defined(NO_BIND)
 NAMEDB=	PROTO.localhost.rev PROTO.localhost-v6.rev named.conf named.root \
 	make-localhost
+.endif
 
 PPPCNF=	ppp.conf
 
@@ -114,8 +122,10 @@ distribution:
 	    ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile
 	cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${MTREE} ${DESTDIR}/etc/mtree
+.if !defined(NO_BIND_ETC) && !defined(NO_BIND)
 	cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${NAMEDB} ${DESTDIR}/etc/namedb
+.endif
 	cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
 	    ${PPPCNF} ${DESTDIR}/etc/ppp
 	cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
@@ -172,6 +182,10 @@ distrib-dirs:
 .if !defined(NO_SENDMAIL)
 	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/
 .endif
+.if defined(WITH_BIND_LIBS) && !defined(NO_BIND)
+	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.include.dist \
+	    -p ${DESTDIR}/usr/include
+.endif
 	cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys
 	cd ${DESTDIR}/usr/share/man/en.ISO8859-1; ln -sf ../man* .
 	cd ${DESTDIR}/usr/share/man; \