Author: ngie
Date: Wed Feb 4 09:33:42 2015
New Revision: 278191
URL: https://svnweb.freebsd.org/changeset/base/278191
Log:
MFC r277733:
r277733:
Honor MK_AMD with etc/rc.d/amd
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 4 09:31:10 2015 (r278190)
+++ stable/10/etc/rc.d/Makefile Wed Feb 4 09:33:42 2015 (r278191)
@@ -11,7 +11,6 @@ FILES= DAEMON \
accounting \
addswap \
adjkerntz \
- amd \
archdep \
atm1 \
atm2 \
@@ -164,6 +163,10 @@ FILES= DAEMON \
zfs \
zvol
+.if ${MK_AMD} != "no"
+FILES+= amd
+.endif
+
.if ${MK_APM} != "no"
FILES+= apm
FILES+= apmd
Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 09:31:10
2015 (r278190)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 09:33:42
2015 (r278191)
@@ -26,6 +26,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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
