From d8256fa17644315cedb9f087102fb6f693c346a3 Mon Sep 17 00:00:00 2001 From: ngie Date: Wed, 4 Feb 2015 09:31:10 +0000 Subject: [PATCH] MFC r277732: r277732: Honor MK_API in etc/rc.d Sponsored by: EMC / Isilon Storage Division git-svn-id: svn://svn.freebsd.org/base/stable/10@278190 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- etc/rc.d/Makefile | 7 +++++-- tools/build/mk/OptionalObsoleteFiles.inc | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 3fe99a0fb..b5112c6ea 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -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 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index c226f0e00..a532b6beb 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -48,6 +48,8 @@ OLD_FILES+=usr/share/man/man8/wire-test.8.gz .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 -- 2.45.0