Convert to SUBDIR.yes format.

Reviewed by:	imp
Sponsored by:	EMC / Isilon Storage Division
Differential Revision:	https://reviews.freebsd.org/D4182

1 files changed, 20 insertions, 60 deletions

diff --git a/sbin/Makefile b/sbin/Makefile
index c828b21145f8..3b17e106e058 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -70,66 +70,26 @@ SUBDIR=adjkerntz \
 	tunefs \
 	umount
 
-.if ${MK_ATM} != "no"
-SUBDIR+=	atm
-.endif
-
-.if ${MK_CASPER} != "no"
-SUBDIR+=	casperd
-.endif
-
-.if ${MK_CCD} != "no"
-SUBDIR+=	ccdconfig
-.endif
-
-.if ${MK_CXX} != "no"
-SUBDIR+=	devd
-.endif
-
-.if ${MK_HAST} != "no"
-SUBDIR+=	hastctl
-SUBDIR+=	hastd
-.endif
-
-.if ${MK_INET6} != "no"
-SUBDIR+=	ping6
-SUBDIR+=	rtsol
-.endif
-	
-.if ${MK_IPFILTER} != "no"
-SUBDIR+=	ipf
-.endif
-
-.if ${MK_IPFW} != "no"
-SUBDIR+=	ipfw
-SUBDIR+=	natd
-.endif
-
-.if ${MK_ISCSI} != "no"
-SUBDIR+=	iscontrol
-.endif
-
-.if ${MK_NAND} != "no"
-SUBDIR+=	nandfs
-SUBDIR+=	newfs_nandfs
-.endif
-
-.if ${MK_PF} != "no"
-SUBDIR+=	pfctl
-SUBDIR+=	pflogd
-.endif
-
-.if ${MK_QUOTAS} != "no"
-SUBDIR+=	quotacheck
-.endif
-
-.if ${MK_ROUTED} != "no"
-SUBDIR+=	routed
-.endif
-
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
+SUBDIR.${MK_ATM}+=	atm
+SUBDIR.${MK_CASPER}+=	casperd
+SUBDIR.${MK_CCD}+=	ccdconfig
+SUBDIR.${MK_CXX}+=	devd
+SUBDIR.${MK_HAST}+=	hastctl
+SUBDIR.${MK_HAST}+=	hastd
+SUBDIR.${MK_INET6}+=	ping6
+SUBDIR.${MK_INET6}+=	rtsol
+SUBDIR.${MK_IPFILTER}+=	ipf
+SUBDIR.${MK_IPFW}+=	ipfw
+SUBDIR.${MK_IPFW}+=	natd
+SUBDIR.${MK_ISCSI}+=	iscontrol
+SUBDIR.${MK_NAND}+=	nandfs
+SUBDIR.${MK_NAND}+=	newfs_nandfs
+SUBDIR.${MK_PF}+=	pfctl
+SUBDIR.${MK_PF}+=	pflogd
+SUBDIR.${MK_QUOTAS}+=	quotacheck
+SUBDIR.${MK_ROUTED}+=	routed
+
+SUBDIR.${MK_TESTS}+=	tests
 
 .include <bsd.arch.inc.mk>