diff options
author | ngie <ngie@FreeBSD.org> | 2015-02-04 09:31:10 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2015-02-04 09:31:10 +0000 |
commit | 152cd06f5340b78af4216d4e197e9cb1e99ead23 (patch) | |
tree | 8948b6ba4e1b0e19b7f7f05e9af8f5f0670ab961 | |
parent | 5f6c6cdef0f4b549fd110f91bb2d7b6f1eca86dd (diff) | |
download | FreeBSD-src-152cd06f5340b78af4216d4e197e9cb1e99ead23.zip FreeBSD-src-152cd06f5340b78af4216d4e197e9cb1e99ead23.tar.gz |
MFC r277732:
r277732:
Honor MK_API in etc/rc.d
Sponsored by: EMC / Isilon Storage Division
-rw-r--r-- | etc/rc.d/Makefile | 7 | ||||
-rw-r--r-- | 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 3fe99a0..b5112c6 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 c226f0e..a532b6b 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 |