From 9c3d2ffcdff40754b2207eb84c1ff0843e225c71 Mon Sep 17 00:00:00 2001
From: sam <sam@FreeBSD.org>
Date: Sun, 21 Sep 2008 22:02:26 +0000
Subject: add new build knobs and jigger some existing controls to improve
 control over the result of buildworld and installworld; this especially helps
 packaging systems such as nanobsd

Reviewed by:	various (posted to arch)
MFC after:	1 month
---
 sbin/Makefile | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

(limited to 'sbin')

diff --git a/sbin/Makefile b/sbin/Makefile
index 1af63c0..0b6bc02 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -40,7 +40,7 @@ SUBDIR=	adjkerntz \
 	ifconfig \
 	init \
 	${_ipf} \
-	ipfw \
+	${_ipfw} \
 	iscontrol \
 	kldconfig \
 	kldload \
@@ -61,7 +61,7 @@ SUBDIR=	adjkerntz \
 	mount_nullfs \
 	mount_udf \
 	mount_unionfs \
-	natd \
+	${_natd} \
 	newfs \
 	newfs_msdos \
 	nfsiod \
@@ -70,13 +70,13 @@ SUBDIR=	adjkerntz \
 	${_pflogd} \
 	ping \
 	${_ping6} \
-	quotacheck \
+	${_quotacheck} \
 	rcorder \
 	reboot \
 	recoverdisk \
 	restore \
 	route \
-	routed \
+	${_routed} \
 	${_rtsol} \
 	savecore \
 	${_sconfig} \
@@ -84,7 +84,7 @@ SUBDIR=	adjkerntz \
 	shutdown \
 	slattach \
 	spppcontrol \
-	startslip \
+	${_startslip} \
 	${_sunlabel} \
 	swapon \
 	sysctl \
@@ -103,6 +103,11 @@ _devd=		devd
 _ipf=		ipf
 .endif
 
+.if ${MK_IPFW} != "no"
+_ipfw=		ipfw
+_natd=		natd
+.endif
+
 .if ${MK_PF} != "no"
 _pfctl=		pfctl
 _pflogd=	pflogd
@@ -117,6 +122,18 @@ _rtsol=		rtsol
 _bsdlabel=	bsdlabel
 .endif
 
+.if ${MK_QUOTAS} != "no"
+_quotacheck=	quotacheck
+.endif
+
+.if ${MK_ROUTED} != "no"
+_routed=	routed
+.endif
+
+.if ${MK_SLIP} != "no"
+_startslip=	startslip
+.endif
+
 .if ${MACHINE_ARCH} == "i386"
 .if ${MACHINE} == "i386"
 _fdisk=		fdisk
-- 
cgit v1.1