From 63d39bea231b1b2f1ae94fa08e1962772c794063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Tue, 24 Sep 2013 10:04:51 +0000 Subject: [PATCH] Replace the unused /etc/unbound directory with a symlink to /var/unbound. Approved by: re (blanket) --- etc/Makefile | 5 +++++ etc/mtree/BSD.root.dist | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index ae52d791324d..ddd1abbffbfb 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -250,6 +250,11 @@ distribution: .if ${MK_BIND_ETC} != "no" ${_+_}cd ${.CURDIR}/namedb; ${MAKE} install .endif +.if ${MK_UNBOUND} != "no" + if [ ! -e ${DESTDIR}/etc/unbound ]; then \ + ${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \ + fi +.endif .if ${MK_SENDMAIL} != "no" ${_+_}cd ${.CURDIR}/sendmail; ${MAKE} distribution .endif diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index 349db40673f0..352ac216803f 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -66,8 +66,6 @@ .. ssl .. - unbound - .. zfs .. ..