svn commit: r275419 - in projects/building-blocks: etc/devd tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Tue Dec  2 19:02:39 2014
New Revision: 275419
URL: https://svnweb.freebsd.org/changeset/base/275419

Log:
  Only install etc/devd/asus.conf if MK_ACPI == yes

Modified:
  projects/building-blocks/etc/devd/Makefile
  projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc

Modified: projects/building-blocks/etc/devd/Makefile
==============================================================================
--- projects/building-blocks/etc/devd/Makefile	Tue Dec  2 18:37:04 2014	(r275418)
+++ projects/building-blocks/etc/devd/Makefile	Tue Dec  2 19:02:39 2014	(r275419)
@@ -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

Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Tue Dec  2 18:37:04 2014	(r275418)
+++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Tue Dec  2 19:02:39 2014	(r275419)
@@ -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