diff options
| author | dougb <dougb@FreeBSD.org> | 2004-10-08 00:14:28 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2004-10-08 00:14:28 +0000 |
| commit | e83c5bbcc52140adcf761eaf48eded4a84959e18 (patch) | |
| tree | fff6f2983e2a23a19f9d8e2731ed2037df8e4411 /etc/Makefile | |
| parent | 1eb71f101cf981b5b465a5c2fdf306d440e51be0 (diff) | |
| download | FreeBSD-src-e83c5bbcc52140adcf761eaf48eded4a84959e18.zip FreeBSD-src-e83c5bbcc52140adcf761eaf48eded4a84959e18.tar.gz | |
1. Incorporate most of Ruslan's improvements to where and how the
/etc/namedb symlink is created.
2. Incorporate Brian's suggestion to make the link relative. This
is necessary to handle situations (such as mergemaster) where the
user is building a tree in a seperate environment. This will also
fix the problem with the way DESTDIR is set in 'make release'.
3. Add a new knob, NO_BIND_MTREE, as suggested by the folks who
already have stuff in /var/named that they don't want me to mess with.
4. Update make.conf(5) with the new stuff, and correct a few paths
that have changed since I last updated it.
Diffstat (limited to 'etc/Makefile')
| -rw-r--r-- | etc/Makefile | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/etc/Makefile b/etc/Makefile index f05f83e..0900b53 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -122,10 +122,18 @@ 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) +.if !defined(NO_BIND) +.if !defined(NO_BIND_ETC) 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 \ @@ -184,9 +192,10 @@ distrib-dirs: mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.include.dist \ -p ${DESTDIR}/usr/include .endif +.if !defined(NO_BIND_MTREE) mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.chroot.dist \ -p ${DESTDIR}/var/named - ln -fhs /var/named/etc/namedb ${DESTDIR}/etc/namedb +.endif .endif .if !defined(NO_SENDMAIL) mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/ |
