svn commit: r278574 - in stable/10: etc/rc.d tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Wed Feb 11 09:16:17 2015
New Revision: 278574
URL: https://svnweb.freebsd.org/changeset/base/278574

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

Modified:
  stable/10/etc/rc.d/Makefile
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/rc.d/Makefile
==============================================================================
--- stable/10/etc/rc.d/Makefile	Wed Feb 11 09:12:10 2015	(r278573)
+++ stable/10/etc/rc.d/Makefile	Wed Feb 11 09:16:17 2015	(r278574)
@@ -152,6 +152,10 @@ FILES=	DAEMON \
 	zfs \
 	zvol
 
+.if ${MK_ACCT} != "no"
+FILES+=		accounting
+.endif
+
 .if ${MK_ACPI} != "no"
 FILES+=		power_profile
 .endif

Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Wed Feb 11 09:12:10 2015	(r278573)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Wed Feb 11 09:16:17 2015	(r278574)
@@ -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