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

[Garrett Cooper]

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

Log:
  Honor MK_AMD with etc/rc.d/amd
  
  MFC after: 1 week
  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:23:36 2015	(r277732)
+++ head/etc/rc.d/Makefile	Mon Jan 26 08:28:51 2015	(r277733)
@@ -11,7 +11,6 @@ FILES=	DAEMON \
 	accounting \
 	addswap \
 	adjkerntz \
-	amd \
 	archdep \
 	atm1 \
 	atm2 \
@@ -156,6 +155,10 @@ FILES=	DAEMON \
 FILES+=		power_profile
 .endif
 
+.if ${MK_AMD} != "no"
+FILES+=		amd
+.endif
+
 .if ${MK_APM} != "no"
 FILES+=	apm
 FILES+=	apmd

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Jan 26 08:23:36 2015	(r277732)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Jan 26 08:28:51 2015	(r277733)
@@ -28,6 +28,7 @@ OLD_FILES+=usr/share/man/man8/iasl.8.gz
 
 .if ${MK_AMD} == no
 OLD_FILES+=etc/amd.map
+OLD_FILES+=etc/rc.d/amd
 OLD_FILES+=usr/bin/pawd
 OLD_FILES+=usr/sbin/amd
 OLD_FILES+=usr/sbin/amq