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
---
 etc/Makefile | 67 ++++++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 54 insertions(+), 13 deletions(-)

(limited to 'etc/Makefile')

diff --git a/etc/Makefile b/etc/Makefile
index 29e72aa..859ceed 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -7,22 +7,19 @@
 SUBDIR=	sendmail
 .endif
 
-BIN1=	amd.map apmd.conf auth.conf \
+BIN1=	auth.conf \
 	crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \
-	ddb.conf dhclient.conf disktab fbtab freebsd-update.conf \
+	ddb.conf dhclient.conf disktab fbtab \
 	ftpusers gettytab group \
-	hosts hosts.allow hosts.equiv hosts.lpd \
+	hosts hosts.allow hosts.equiv \
 	inetd.conf libalias.conf login.access login.conf mac.conf motd \
 	netconfig network.subr networks newsyslog.conf nsswitch.conf \
-	portsnap.conf pf.os phones profile protocols \
+	phones profile protocols \
 	rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \
 	rc.sendmail rc.shutdown \
-	rc.subr regdomain.xml remote rpc services shells \
-	snmpd.config sysctl.conf syslog.conf \
-	etc.${MACHINE_ARCH}/ttys \
-	${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \
-	${.CURDIR}/../usr.bin/mail/misc/mail.rc \
-	${.CURDIR}/../usr.bin/locate/locate/locate.rc
+	rc.subr remote rpc services shells \
+	sysctl.conf syslog.conf \
+	etc.${MACHINE_ARCH}/ttys
 
 OPENBSMDIR=			${.CURDIR}/../contrib/openbsm
 BSM_ETC_OPEN_FILES=		${OPENBSMDIR}/etc/audit_class \
@@ -32,12 +29,38 @@ BSM_ETC_RESTRICTED_FILES=	${OPENBSMDIR}/etc/audit_control \
 BSM_ETC_EXEC_FILES=		${OPENBSMDIR}/etc/audit_warn
 BSM_ETC_DIR=			${DESTDIR}/etc/security
 
+# NB: keep these sorted by MK_* knobs
+
+.if ${MK_AMD} != "no"
+BIN1+= amd.map
+.endif
+
+.if ${MK_APM} != "no"
+BIN1+= apmd.conf
+.endif
+
+.if ${MK_BSNMP} != "no"
+BIN1+= snmpd.config
+.endif
+
+.if ${MK_FREEBSD_UPDATE} != "no"
+BIN1+= freebsd-update.conf
+.endif
+
+.if ${MK_LOCATE} != "no"
+BIN1+=	${.CURDIR}/../usr.bin/locate/locate/locate.rc
+.endif
+
 .if ${MK_LPR} != "no"
-BIN1+=	printcap
+BIN1+=	hosts.lpd printcap
 .endif
 
-.if ${MK_NS_CACHING} != "no"
-BIN1+= nscd.conf
+.if ${MK_MAIL} != "no"
+BIN1+=	${.CURDIR}/../usr.bin/mail/misc/mail.rc
+.endif
+
+.if ${MK_MAN} != "no"
+BIN1+=	${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config
 .endif
 
 .if ${MK_OPENSSH} != "no"
@@ -49,6 +72,18 @@ SSH=	${.CURDIR}/../crypto/openssh/ssh_config \
 SSL=	${.CURDIR}/../crypto/openssl/apps/openssl.cnf
 .endif
 
+.if ${MK_NS_CACHING} != "no"
+BIN1+= nscd.conf
+.endif
+
+.if ${MK_PORTSNAP} != "no"
+BIN1+= portsnap.conf
+.endif
+
+.if ${MK_PF} != "no"
+BIN1+= pf.os
+.endif
+
 # -rwxr-xr-x root:wheel, for the new cron root:wheel
 BIN2=	netstart pccard_ether rc.suspend rc.resume
 
@@ -112,7 +147,9 @@ distribution:
 		master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \
 	    pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \
 		${DESTDIR}/etc/master.passwd
+.if ${MK_BLUETOOTH} != "no"
 	${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
+.endif
 	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
 	${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
@@ -164,8 +201,11 @@ distribution:
 	    ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile
 	cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${MTREE} ${DESTDIR}/etc/mtree
+.if ${MK_PPP} != "no"
 	cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
 	    ${PPPCNF} ${DESTDIR}/etc/ppp
+.endif
+.if ${MK_MAIL} != "no"
 	cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${ETCMAIL} ${DESTDIR}/etc/mail
 	@if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \
@@ -173,6 +213,7 @@ distribution:
 		set -x; \
 		ln -s mail/aliases ${DESTDIR}/etc/aliases; \
 	fi
+.endif
 	${INSTALL} -o ${BINOWN} -g operator -m 664 /dev/null \
 	    ${DESTDIR}/etc/dumpdates
 	${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \
-- 
cgit v1.1