[Midnightbsd-cvs] src: Makefile: Fix bind mergemaster issues.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Fix bind mergemaster issues.

Modified Files:
--------------
    src/etc:
        Makefile (r1.12 -> r1.13)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/etc/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -L etc/Makefile -L etc/Makefile -u -r1.12 -r1.13
--- etc/Makefile
+++ etc/Makefile
@@ -52,11 +52,6 @@
 .endif
 .endif
 
-.if !defined(NO_BIND_ETC) && !defined(NO_BIND) && !defined(NO_BIND_MTREE)
-NAMEDB=	PROTO.localhost.rev PROTO.localhost-v6.rev named.conf named.root \
-	make-localhost
-.endif
-
 PPPCNF=	ppp.conf
 
 .if defined(NO_SENDMAIL)
@@ -115,6 +110,17 @@
 .if !defined(NO_I4B)
 	cd ${.CURDIR}/isdn; ${MAKE} install
 .endif
+.if !defined(NO_BIND)
+.if !defined(NO_BIND_MTREE)
+	@if [ ! -e ${DESTDIR}/etc/namedb ]; then \
+		set -x; \
+		ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \
+	fi
+.endif
+.if !defined(NO_BIND_ETC)
+	cd ${.CURDIR}/namedb; ${MAKE} install
+.endif
+.endif
 .if !defined(NO_SENDMAIL)
 	cd ${.CURDIR}/sendmail; ${MAKE} distribution
 .endif
@@ -148,18 +154,6 @@
             ln ${DESTDIR}/root/.mkshrc ${DESTDIR}/.mkshrc
 	cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${MTREE} ${DESTDIR}/etc/mtree
-.if !defined(NO_BIND)
-.if !defined(NO_BIND_ETC) && !defined(NO_BIND_MTREE)
-	cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
-	    ${NAMEDB} ${DESTDIR}/var/named/etc/namedb
-.endif
-.if !defined(NO_BIND_MTREE)
-	@if [ ! -e ${DESTDIR}/etc/namedb ]; then \
-		set -x; \
-		ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \
-	fi
-.endif
-.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 \