diff options
| author | dougb <dougb@FreeBSD.org> | 2007-06-18 05:44:38 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2007-06-18 05:44:38 +0000 |
| commit | c2485b20cbbed190fed968003857dd1d0e048975 (patch) | |
| tree | 4da8ae99d74d843eb10bc0ea76d48280d3aa3796 | |
| parent | 4161ea30e81cda37b42b86eaa4d79aed1080ab3e (diff) | |
| download | FreeBSD-src-c2485b20cbbed190fed968003857dd1d0e048975.zip FreeBSD-src-c2485b20cbbed190fed968003857dd1d0e048975.tar.gz | |
Add a namedb/master directory for the zone files I'm about to add,
and switch to the more "normal" way of installing files for the
namedb directory so that we can pick up the new subdir.
| -rw-r--r-- | etc/Makefile | 24 | ||||
| -rw-r--r-- | etc/namedb/Makefile | 10 | ||||
| -rw-r--r-- | etc/namedb/master/Makefile | 9 |
3 files changed, 24 insertions, 19 deletions
diff --git a/etc/Makefile b/etc/Makefile index 5f98517..ffc3582 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -64,11 +64,6 @@ MTREE+= BIND.include.dist .endif .endif -.if ${MK_BIND_ETC} != "no" -NAMEDB= PROTO.localhost.rev PROTO.localhost-v6.rev named.conf named.root \ - make-localhost -.endif - PPPCNF= ppp.conf .if ${MK_SENDMAIL} == "no" @@ -135,6 +130,15 @@ distribution: .if ${MK_I4B} != "no" cd ${.CURDIR}/isdn; ${MAKE} install .endif +.if ${MK_BIND_MTREE} != "no" + @if [ ! -e ${DESTDIR}/etc/namedb ]; then \ + set -x; \ + ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \ + fi +.endif +.if ${MK_BIND_ETC} != "no" + cd ${.CURDIR}/namedb; ${MAKE} install +.endif .if ${MK_SENDMAIL} != "no" cd ${.CURDIR}/sendmail; ${MAKE} distribution .endif @@ -163,16 +167,6 @@ distribution: ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${MTREE} ${DESTDIR}/etc/mtree -.if ${MK_BIND_ETC} != "no" - cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - ${NAMEDB} ${DESTDIR}/var/named/etc/namedb -.endif -.if ${MK_BIND_MTREE} != "no" - @if [ ! -e ${DESTDIR}/etc/namedb ]; then \ - set -x; \ - ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \ - fi -.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 \ diff --git a/etc/namedb/Makefile b/etc/namedb/Makefile index 1d240f6..3a5e1f6 100644 --- a/etc/namedb/Makefile +++ b/etc/namedb/Makefile @@ -1,9 +1,11 @@ # $FreeBSD$ -FILES= PROTO.localhost.rev PROTO.localhost-v6.rev named.conf named.root \ - make-localhost +SUBDIR= master + +FILES= named.conf named.root + NO_OBJ= -FILESDIR= /etc/namedb -FILESMODE= 644 +FILESDIR= /etc/namedb +FILESMODE= 644 .include <bsd.prog.mk> diff --git a/etc/namedb/master/Makefile b/etc/namedb/master/Makefile new file mode 100644 index 0000000..7907bf3 --- /dev/null +++ b/etc/namedb/master/Makefile @@ -0,0 +1,9 @@ +# $FreeBSD$ + +FILES= empty.db localhost-forward.db localhost-reverse.db + +NO_OBJ= +FILESDIR= /etc/namedb/master +FILESMODE= 644 + +.include <bsd.prog.mk> |
