summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authordteske <dteske@FreeBSD.org>2013-07-06 04:13:47 +0000
committerdteske <dteske@FreeBSD.org>2013-07-06 04:13:47 +0000
commitf7464e7e0414bb36578cd7945036bd3c90499c42 (patch)
tree4329f85cf2ce348b90e6158eaa0d05726b24eb1f /usr.sbin
parent614a3b30cf5a5a5dbe916b4a9020ec2773d05b2d (diff)
downloadFreeBSD-src-f7464e7e0414bb36578cd7945036bd3c90499c42.zip
FreeBSD-src-f7464e7e0414bb36578cd7945036bd3c90499c42.tar.gz
Take the training-wheels off, after nearly 30 months of development. MFC to
stable/9 planned after MFC 3-day period. The MFC to stable/9 is desired for the next release to get some much-needed time: + Living side-by-side with sysinstall for compare/contrast/transition + Living side-by-side with bsdinstall for integration/transition + Additional feedback/testing before eventual 10.0-R to make it even better MFC after: 3 days
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/Makefile7
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 02e590e..acdc613 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -6,6 +6,7 @@
SUBDIR= adduser \
arp \
bootparamd \
+ bsdconfig \
bsdinstall \
cdcontrol \
chkgrp \
@@ -80,6 +81,7 @@ SUBDIR= adduser \
snapinfo \
spray \
syslogd \
+ sysrc \
tcpdchk \
tcpdmatch \
tcpdrop \
@@ -146,11 +148,6 @@ SUBDIR+= rndc-confgen
SUBDIR+= bluetooth
.endif
-.if ${MK_BSDCONFIG} != "no"
-SUBDIR+= bsdconfig
-SUBDIR+= sysrc
-.endif
-
.if ${MK_BSNMP} != "no"
SUBDIR+= bsnmpd
.endif
OpenPOWER on IntegriCloud