summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authoremaste <emaste@FreeBSD.org>2015-02-24 19:27:51 +0000
committeremaste <emaste@FreeBSD.org>2015-02-24 19:27:51 +0000
commiteca02d5385c280e24e44c4f86025ef339ba63c25 (patch)
tree346ad643da915b7fda80970f406ad9f84cfc7e74 /etc
parent1d8fc87a83fd4e5b02f267fa7e231ebc5e70a3e0 (diff)
downloadFreeBSD-src-eca02d5385c280e24e44c4f86025ef339ba63c25.zip
FreeBSD-src-eca02d5385c280e24e44c4f86025ef339ba63c25.tar.gz
Unconditionally install debug directory hierarchy
This avoids various failure modes (e.g., when building and installing a single binary with debug data on a system that otherwise does not have it enabled). It is also consistent with the way other directory hierarchies are handled (e.g. share/man). Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D1962
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile11
1 files changed, 3 insertions, 8 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 79ffb99..b714af5 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -158,16 +158,13 @@ BIN1+= regdomain.xml
# -rwxr-xr-x root:wheel, for the new cron root:wheel
BIN2= netstart pccard_ether rc.suspend rc.resume
-MTREE= BSD.include.dist BSD.root.dist BSD.usr.dist BSD.var.dist
+MTREE= BSD.debug.dist BSD.include.dist BSD.root.dist BSD.usr.dist BSD.var.dist
.if ${MK_TESTS} != "no"
MTREE+= BSD.tests.dist
.endif
.if ${MK_SENDMAIL} != "no"
MTREE+= BSD.sendmail.dist
.endif
-.if ${MK_DEBUG_FILES} != "no"
-MTREE+= BSD.debug.dist
-.endif
PPPCNF= ppp.conf
@@ -346,10 +343,8 @@ MTREE_CMD?= mtree
MTREES= mtree/BSD.root.dist / \
mtree/BSD.var.dist /var \
mtree/BSD.usr.dist /usr \
- mtree/BSD.include.dist /usr/include
-.if ${MK_DEBUG_FILES} != "no"
-MTREES+= mtree/BSD.debug.dist /usr/lib
-.endif
+ mtree/BSD.include.dist /usr/include \
+ mtree/BSD.debug.dist /usr/lib
.if ${MK_GROFF} != "no"
MTREES+= mtree/BSD.groff.dist /usr
.endif
OpenPOWER on IntegriCloud