svn commit: r277738 - in head: etc/defaults tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Mon Jan 26 09:31:48 2015
New Revision: 277738
URL: https://svnweb.freebsd.org/changeset/base/277738

Log:
  Honor MK_BLUETOOTH with etc/defaults/bluetooth.device.conf
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/etc/defaults/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/etc/defaults/Makefile
==============================================================================
--- head/etc/defaults/Makefile	Mon Jan 26 08:50:12 2015	(r277737)
+++ head/etc/defaults/Makefile	Mon Jan 26 09:31:48 2015	(r277738)
@@ -1,7 +1,13 @@
 # $FreeBSD$
 
-FILES=	bluetooth.device.conf devfs.rules periodic.conf rc.conf
+.include <src.opts.mk>
+
+FILES=	devfs.rules periodic.conf rc.conf
 NO_OBJ=
 FILESDIR= /etc/defaults
 
+.if ${MK_BLUETOOTH} != "no"
+FILES+=	bluetooth.device.conf
+.endif
+
 .include <bsd.prog.mk>

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Jan 26 08:50:12 2015	(r277737)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Jan 26 09:31:48 2015	(r277738)
@@ -185,6 +185,7 @@ OLD_DIRS+=usr/share/examples/bhyve
 OLD_FILES+=etc/bluetooth/hcsecd.conf
 OLD_FILES+=etc/bluetooth/hosts
 OLD_FILES+=etc/bluetooth/protocols
+OLD_FILES+=etc/defaults/bluetooth.device.conf
 OLD_DIRS+=etc/bluetooth
 OLD_FILES+=usr/bin/bthost
 OLD_FILES+=usr/bin/btsockstat