diff options
| author | ngie <ngie@FreeBSD.org> | 2015-02-04 09:33:42 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-02-04 09:33:42 +0000 |
| commit | 6cbea0fc89c154fb5824e46613301e5bb40568fb (patch) | |
| tree | c66ce6ac2e39353590c2f147ee4ac5834d5d39f4 | |
| parent | 152cd06f5340b78af4216d4e197e9cb1e99ead23 (diff) | |
| download | FreeBSD-src-6cbea0fc89c154fb5824e46613301e5bb40568fb.zip FreeBSD-src-6cbea0fc89c154fb5824e46613301e5bb40568fb.tar.gz | |
MFC r277733:
r277733:
Honor MK_AMD with etc/rc.d/amd
Sponsored by: EMC / Isilon Storage Division
| -rw-r--r-- | etc/rc.d/Makefile | 5 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index b5112c6..8c69fb6 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -11,7 +11,6 @@ FILES= DAEMON \ accounting \ addswap \ adjkerntz \ - amd \ archdep \ atm1 \ atm2 \ @@ -164,6 +163,10 @@ FILES= DAEMON \ zfs \ zvol +.if ${MK_AMD} != "no" +FILES+= amd +.endif + .if ${MK_APM} != "no" FILES+= apm FILES+= apmd diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index a532b6b..968f60d 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -26,6 +26,7 @@ OLD_FILES+=usr/share/man/man8/iasl.8.gz .if ${MK_AMD} == no OLD_FILES+=etc/amd.map +OLD_FILES+=etc/rc.d/amd OLD_FILES+=usr/bin/pawd OLD_FILES+=usr/sbin/amd OLD_FILES+=usr/sbin/amq |
