diff options
| author | ngie <ngie@FreeBSD.org> | 2015-02-04 09:14:07 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-02-04 09:14:07 +0000 |
| commit | 4387ccbff5139246eed2871a9bcc73c92a767e66 (patch) | |
| tree | 876bc6ec283100802aa6933dfad12af158a2352d | |
| parent | 50ffbe800bc375cb06b3343631d5013b624ada4b (diff) | |
| download | FreeBSD-src-4387ccbff5139246eed2871a9bcc73c92a767e66.zip FreeBSD-src-4387ccbff5139246eed2871a9bcc73c92a767e66.tar.gz | |
MFC r277738:
r277738:
Honor MK_BLUETOOTH with etc/defaults/bluetooth.device.conf
Sponsored by: EMC / Isilon Storage Division
| -rw-r--r-- | etc/defaults/Makefile | 8 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/etc/defaults/Makefile b/etc/defaults/Makefile index c6555e6..20cb53d 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 <bsd.own.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 41aaeee..24dfeb1 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -143,6 +143,8 @@ OLD_FILES+=usr/share/man/man8/authpf-noip.8.gz OLD_FILES+=etc/bluetooth/hcsecd.conf OLD_FILES+=etc/bluetooth/hosts OLD_FILES+=etc/bluetooth/protocols +OLD_DIRS+=etc/bluetooth +OLD_FILES+=etc/defaults/bluetooth.device.conf OLD_FILES+=usr/bin/bthost OLD_FILES+=usr/bin/btsockstat OLD_FILES+=usr/bin/rfcomm_sppd |
