diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2014-11-29 07:41:02 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2014-11-29 07:41:02 +0000 |
| commit | fb96e8ee7767e3501fe4a082c86ac44c81853309 (patch) | |
| tree | d70e7fc504abb2edf5a53acf525f11344952ee4a | |
| parent | 840e70929b3bc0bfdbccfd8d8626d6e2f29ddbcf (diff) | |
| download | src-fb96e8ee7767e3501fe4a082c86ac44c81853309.tar.gz src-fb96e8ee7767e3501fe4a082c86ac44c81853309.zip | |
Honor MK_BLUETOOTH when installing bluetooth.device.conf
Notes
Notes:
svn path=/projects/building-blocks/; revision=275235
| -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 c6555e6de00f..1f6ac5ee3f88 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 4579308cd13b..11c20287b205 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -182,6 +182,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 |