diff options
| author | ngie <ngie@FreeBSD.org> | 2015-01-26 08:23:36 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-01-26 08:23:36 +0000 |
| commit | 257aba085730d64b00b00e69f6ec003f6b6a847e (patch) | |
| tree | b5ae23c9786ecaeb1724aee4e9f5a803401b2b62 | |
| parent | 7baa1b2056a33101fd91702ee11726d0ecf6b227 (diff) | |
| download | FreeBSD-src-257aba085730d64b00b00e69f6ec003f6b6a847e.zip FreeBSD-src-257aba085730d64b00b00e69f6ec003f6b6a847e.tar.gz | |
Honor MK_API in etc/rc.d
MFC after: 1 week
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 68c95ba..d5f0458 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 35ea149..4ff092c 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 |
