summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-10-07 18:07:27 -0300
committerRenato Botelho <renato@netgate.com>2015-10-07 18:07:27 -0300
commit945ed01c4bae06169f63978e43029c04d4abd731 (patch)
tree5cd3ae372187bd25416aeec230f31242c3729be7 /etc
parent8aae621ec1e941b8f27411df1bace42778e61b99 (diff)
parent36b47c3278c31b909b37616c58ccf4f148a9e47c (diff)
downloadFreeBSD-src-945ed01c4bae06169f63978e43029c04d4abd731.zip
FreeBSD-src-945ed01c4bae06169f63978e43029c04d4abd731.tar.gz
Merge branch 'stable/10' into devel
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 2b02717..1927580 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -154,16 +154,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
@@ -336,10 +333,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