Date: Mon, 26 Jan 2015 08:23:37 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r277732 - in head: etc/rc.d tools/build/mk Message-ID: <201501260823.t0Q8NbpH005453@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Mon Jan 26 08:23:36 2015 New Revision: 277732 URL: https://svnweb.freebsd.org/changeset/base/277732 Log: Honor MK_API in etc/rc.d 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:20:51 2015 (r277731) +++ head/etc/rc.d/Makefile Mon Jan 26 08:23:36 2015 (r277732) @@ -12,8 +12,6 @@ FILES= DAEMON \ addswap \ adjkerntz \ amd \ - apm \ - apmd \ archdep \ atm1 \ atm2 \ @@ -158,6 +156,11 @@ FILES= DAEMON \ FILES+= power_profile .endif +.if ${MK_APM} != "no" +FILES+= apm +FILES+= apmd +.endif + .if ${MK_AUTOFS} != "no" FILES+= automount FILES+= automountd Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 08:20:51 2015 (r277731) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 08:23:36 2015 (r277732) @@ -50,6 +50,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?201501260823.t0Q8NbpH005453>