From 4290777e251cea3a3e3435f357f1541f673345ef Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Mon, 26 Jan 2015 08:23:36 +0000 Subject: [PATCH] Honor MK_API in etc/rc.d MFC after: 1 week Sponsored by: EMC / Isilon Storage Division --- 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 68c95ba8aec5..d5f04587fa08 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 \ @@ -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 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 35ea1499e3a6..4ff092cdfe85 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -50,6 +50,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