svn commit: r277736 - in head: etc/rc.d tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Mon Jan 26 08:46:26 2015
New Revision: 277736
URL: https://svnweb.freebsd.org/changeset/base/277736

Log:
  Honor MK_ACCT with etc/rc.d/accounting
  
  MFC after: 2 weeks
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/etc/rc.d/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile	Mon Jan 26 08:42:47 2015	(r277735)
+++ head/etc/rc.d/Makefile	Mon Jan 26 08:46:26 2015	(r277736)
@@ -150,6 +150,10 @@ FILES=	DAEMON \
 	zfs \
 	zvol
 
+.if ${MK_ACCT} != "no"
+FILES+=		accounting
+.endif
+
 .if ${MK_ACPI} != "no"
 FILES+=		power_profile
 .endif

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Jan 26 08:42:47 2015	(r277735)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Jan 26 08:46:26 2015	(r277736)
@@ -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