svn commit: r275098 - in projects/building-blocks: etc/rc.d tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Wed Nov 26 02:46:48 2014
New Revision: 275098
URL: https://svnweb.freebsd.org/changeset/base/275098

Log:
  Only install the accounting/apm rc scripts for MK_ACCT/MK_APM if the relevant
  knobs are set

Modified:
  projects/building-blocks/etc/rc.d/Makefile
  projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc

Modified: projects/building-blocks/etc/rc.d/Makefile
==============================================================================
--- projects/building-blocks/etc/rc.d/Makefile	Wed Nov 26 02:37:00 2014	(r275097)
+++ projects/building-blocks/etc/rc.d/Makefile	Wed Nov 26 02:46:48 2014	(r275098)
@@ -8,12 +8,9 @@ FILES=	DAEMON \
 	NETWORKING \
 	SERVERS \
 	abi \
-	accounting \
 	addswap \
 	adjkerntz \
 	amd \
-	apm \
-	apmd \
 	archdep \
 	atm1 \
 	atm2 \
@@ -164,6 +161,15 @@ FILES=	DAEMON \
 	zfs \
 	zvol
 
+.if ${MK_ACCT} != "no"
+FILES+=	accounting
+.endif
+
+.if ${MK_APM} != "no"
+FILES+=	apm
+FILES+=	apmd
+.endif
+
 .if ${MK_BLUETOOTH} != "no"
 _bluetooth=	bluetooth
 _bthidd=	bthidd

Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Wed Nov 26 02:37:00 2014	(r275097)
+++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Wed Nov 26 02:46:48 2014	(r275098)
@@ -6,6 +6,7 @@
 #
 
 .if ${MK_ACCT} == no
+OLD_FILES+=etc/rc.d/accounting
 OLD_FILES+=etc/periodic/daily/310.accounting
 OLD_FILES+=usr/sbin/accton
 OLD_FILES+=usr/sbin/sa
@@ -48,6 +49,8 @@ OLD_FILES+=usr/share/man/man8/wire-test.
 .endif
 
 .if ${MK_APM} == no
+OLD_FILES+=etc/rc.d/apm
+OLD_FILES+=etc/rc.d/apmd
 OLD_FILES+=etc/apmd.conf
 OLD_FILES+=usr/sbin/apm
 OLD_FILES+=usr/share/examples/etc/apmd.conf