aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2014-12-02 19:02:39 +0000
committerEnji Cooper <ngie@FreeBSD.org>2014-12-02 19:02:39 +0000
commit488ced8671a819bc0e45a2c5fdbb510b6232db9c (patch)
tree06cf0a8b68569d9324c344f66400734e552977b1
parentc415effcef12a7cc6e8ef0b1702501614e20297e (diff)
downloadsrc-488ced8671a819bc0e45a2c5fdbb510b6232db9c.tar.gz
src-488ced8671a819bc0e45a2c5fdbb510b6232db9c.zip
Notes
-rw-r--r--etc/devd/Makefile4
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc1
2 files changed, 5 insertions, 0 deletions
diff --git a/etc/devd/Makefile b/etc/devd/Makefile
index 27dfb92f1711..a0909af08918 100644
--- a/etc/devd/Makefile
+++ b/etc/devd/Makefile
@@ -2,12 +2,16 @@
.include <src.opts.mk>
+FILES=
+
.if ${MACHINE} == "powerpc"
FILES+= apple.conf
.endif
.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+.if ${MK_ACPI} != "no"
FILES+= asus.conf
+.endif
.if ${MK_HYPERV} != "no"
FILES+= hyperv.conf
.endif
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 1cba28fa07d0..e198075f41e8 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -15,6 +15,7 @@ OLD_FILES+=usr/share/man/man8/sa.8.gz
.endif
.if ${MK_ACPI} == no
+OLD_FILES+=etc/devd/asus.conf
OLD_FILES+=etc/rc.d/power_profile
OLD_FILES+=usr/sbin/acpiconf
OLD_FILES+=usr/sbin/acpidb