Date: Wed, 4 Feb 2015 09:31:11 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r278190 - in stable/10: etc/rc.d tools/build/mk Message-ID: <201502040931.t149VBBL028507@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Wed Feb 4 09:31:10 2015 New Revision: 278190 URL: https://svnweb.freebsd.org/changeset/base/278190 Log: MFC r277732: r277732: Honor MK_API in etc/rc.d 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:23:40 2015 (r278189) +++ stable/10/etc/rc.d/Makefile Wed Feb 4 09:31:10 2015 (r278190) @@ -12,8 +12,6 @@ FILES= DAEMON \ addswap \ adjkerntz \ amd \ - apm \ - apmd \ archdep \ atm1 \ atm2 \ @@ -166,6 +164,11 @@ FILES= DAEMON \ zfs \ zvol +.if ${MK_APM} != "no" +FILES+= apm +FILES+= apmd +.endif + .if ${MK_BLUETOOTH} != "no" _bluetooth= bluetooth _bthidd= bthidd Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 09:23:40 2015 (r278189) +++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 09:31:10 2015 (r278190) @@ -48,6 +48,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502040931.t149VBBL028507>