unify the way we prefer other things

1 files changed, 12 insertions, 27 deletions

diff --git a/sbin/Makefile b/sbin/Makefile
index e33092d6820..c99e2a3c337 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -1,33 +1,18 @@
-#	$OpenBSD: Makefile,v 1.80 2006/07/04 05:31:54 mbalmer Exp $
+#	$OpenBSD: Makefile,v 1.81 2007/05/18 07:18:55 deraadt Exp $
 
 # Not ported: XNSrouted enpload scsiformat startslip
 # Missing: icheck
 
-SUBDIR= atactl badsect bioctl brconfig ccdconfig disklabel dmesg dhclient \
-	fsck growfs ifconfig init iopctl ipsecctl isakmpd kbd lmccontrol \
-	mknod modload modunload mount mountd ncheck_ffs nfsd nmeaattach \
-	nologin pfctl pflogd ping quotacheck raidctl reboot route routed \
-	savecore scan_ffs scsi shutdown slattach swapctl sysctl \
-	ttyflags umount
-
-# support for various file systems
-SUBDIR+= mount_ados
-SUBDIR+= mount_cd9660
-SUBDIR+= mount_ffs	newfs fsck_ffs fsdb dumpfs dump restore clri tunefs fsirand
-# mount_mfs -> newfs
-SUBDIR+= mount_msdos	newfs_msdos fsck_msdos
-SUBDIR+= mount_nfs
-SUBDIR+= mount_ntfs
-SUBDIR+= mount_portal
-SUBDIR+= mount_procfs
-SUBDIR+= mount_udf
-SUBDIR+= mount_ext2fs fsck_ext2fs
-SUBDIR+= mount_xfs
-
-# IPv6
-SUBDIR+= ping6 rtsol
-
-# Man pages (and manpages to do)
-SUBDIR+= fdisk pdisk wsconsctl
+SUBDIR=	atactl badsect bioctl brconfig ccdconfig clri dhclient \
+	disklabel dmesg dump dumpfs fdisk fsck fsck_ext2fs fsck_ffs  \
+	fsck_msdos fsdb fsirand growfs ifconfig init iopctl ipsecctl  \
+	isakmpd kbd lmccontrol mknod modload modunload mount \
+	mount_ados mount_cd9660 mount_ext2fs mount_ffs mount_msdos \
+	mount_nfs mount_ntfs mount_portal mount_procfs mount_udf \
+	mount_xfs mountd ncheck_ffs newfs newfs_msdos \
+	nfsd nmeaattach nologin pdisk pfctl pflogd ping ping6 quotacheck \
+	raidctl reboot restore route routed rtsol savecore scan_ffs \
+	scsi shutdown slattach swapctl sysctl ttyflags tunefs \
+	umount wsconsctl
 
 .include <bsd.subdir.mk>