Date: Sat, 29 Nov 2014 07:41:03 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275235 - in projects/building-blocks: etc/defaults tools/build/mk Message-ID: <201411290741.sAT7f3Me027198@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sat Nov 29 07:41:02 2014 New Revision: 275235 URL: https://svnweb.freebsd.org/changeset/base/275235 Log: Honor MK_BLUETOOTH when installing bluetooth.device.conf Modified: projects/building-blocks/etc/defaults/Makefile projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/etc/defaults/Makefile ============================================================================== --- projects/building-blocks/etc/defaults/Makefile Sat Nov 29 06:53:06 2014 (r275234) +++ projects/building-blocks/etc/defaults/Makefile Sat Nov 29 07:41:02 2014 (r275235) @@ -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: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Sat Nov 29 06:53:06 2014 (r275234) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Sat Nov 29 07:41:02 2014 (r275235) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411290741.sAT7f3Me027198>