diff options
| author | ngie <ngie@FreeBSD.org> | 2015-01-26 09:31:48 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-01-26 09:31:48 +0000 |
| commit | ce8bfdf2f6cb1be7f5547a4b56e7544f890c214e (patch) | |
| tree | 752ab188209938a4aa7ce9c1a4dcada1c4952472 | |
| parent | 6057fab1ce7e215b12641f1ad2c05740ad04c42b (diff) | |
| download | FreeBSD-src-ce8bfdf2f6cb1be7f5547a4b56e7544f890c214e.zip FreeBSD-src-ce8bfdf2f6cb1be7f5547a4b56e7544f890c214e.tar.gz | |
Honor MK_BLUETOOTH with etc/defaults/bluetooth.device.conf
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
| -rw-r--r-- | etc/defaults/Makefile | 8 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/etc/defaults/Makefile b/etc/defaults/Makefile index c6555e6..1f6ac5e 100644 --- a/etc/defaults/Makefile +++ b/etc/defaults/Makefile @@ -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> diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index e625428..cccee3c 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -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 |
