diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2007-01-23 07:34:33 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2007-01-23 07:34:33 +0000 |
| commit | a93a56e08f57ee03f3cbddf61223d7a06cf4610e (patch) | |
| tree | e8d12530532e79c918c74ad868f8179a9ae72118 | |
| parent | 1bc5e02b94a1524de2ccb7e2f0704a895ad77de6 (diff) | |
Move bluetooth.conf D-Bus security file into daemon directory
| -rw-r--r-- | daemon/Makefile.am | 6 | ||||
| -rw-r--r-- | daemon/bluetooth.conf (renamed from hcid/bluetooth.conf) | 0 | ||||
| -rw-r--r-- | hcid/Makefile.am | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/daemon/Makefile.am b/daemon/Makefile.am index f9474a8d..e7133f43 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -17,6 +17,12 @@ bluetoothd_service_echo_LDADD = \ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ endif +if CONFIGFILES +dbusdir = $(sysconfdir)/dbus-1/system.d + +dbus_DATA = bluetooth.conf +endif + noinst_PROGRAMS = bluetoothd bluetoothd_SOURCES = main.c system.h \ diff --git a/hcid/bluetooth.conf b/daemon/bluetooth.conf index aa642a2a..aa642a2a 100644 --- a/hcid/bluetooth.conf +++ b/daemon/bluetooth.conf diff --git a/hcid/Makefile.am b/hcid/Makefile.am index 4656412b..973960b5 100644 --- a/hcid/Makefile.am +++ b/hcid/Makefile.am @@ -7,10 +7,6 @@ conf_DATA = hcid.conf statedir = $(localstatedir)/lib/bluetooth state_DATA = - -dbusdir = $(sysconfdir)/dbus-1/system.d - -dbus_DATA = bluetooth.conf endif noinst_LIBRARIES = libhciserver.a @@ -61,7 +57,7 @@ AM_YFLAGS = -d CLEANFILES = lexer.c parser.c parser.h -EXTRA_DIST = $(man_MANS) hcid.conf bluetooth.conf dbus-api.txt \ +EXTRA_DIST = $(man_MANS) hcid.conf dbus-api.txt \ service-record.dtd service-did.xml service-spp.xml \ service-opp.xml service-ftp.xml |