68 lines
1.8 KiB
Diff
68 lines
1.8 KiB
Diff
diff --git Makefile.am Makefile.am
|
|
index 6135524..5efb6f6 100644
|
|
--- Makefile.am
|
|
+++ Makefile.am
|
|
@@ -136,15 +136,15 @@ noinst_PROGRAMS =
|
|
if DBUS_POLICY
|
|
dbus_datadir = @DBUS_DATADIR@/dbus-1/system.d
|
|
dist_dbus_data_DATA =
|
|
+
|
|
+dbus_busdir = @DBUS_BUSDIR@
|
|
+dbus_bus_DATA =
|
|
endif
|
|
|
|
if SYSTEMD_SERVICE
|
|
systemd_unitdir = @SYSTEMD_UNITDIR@
|
|
systemd_unit_DATA =
|
|
|
|
-dbus_busdir = @DBUS_BUSDIR@
|
|
-dbus_bus_DATA =
|
|
-
|
|
systemd_modloaddir = @SYSTEMD_MODLOADDIR@
|
|
systemd_modload_DATA = src/pkcs8.conf
|
|
endif
|
|
@@ -218,13 +218,13 @@ endif
|
|
|
|
if DBUS_POLICY
|
|
dist_dbus_data_DATA += src/iwd-dbus.conf
|
|
+dbus_bus_DATA += src/net.connman.iwd.service
|
|
endif
|
|
|
|
if SYSTEMD_SERVICE
|
|
src_iwd_DEPENDENCIES += src/iwd.service
|
|
|
|
systemd_unit_DATA += src/iwd.service
|
|
-dbus_bus_DATA += src/net.connman.iwd.service
|
|
endif
|
|
endif
|
|
|
|
@@ -277,13 +277,13 @@ wired_ead_DEPENDENCIES = $(ell_dependencies)
|
|
|
|
if DBUS_POLICY
|
|
dist_dbus_data_DATA += wired/ead-dbus.conf
|
|
+dbus_bus_DATA += wired/net.connman.ead.service
|
|
endif
|
|
|
|
if SYSTEMD_SERVICE
|
|
wired_ead_DEPENDENCIES += wired/ead.service
|
|
|
|
systemd_unit_DATA += wired/ead.service
|
|
-dbus_bus_DATA += wired/net.connman.ead.service
|
|
endif
|
|
endif
|
|
|
|
diff --git configure.ac configure.ac
|
|
index ec0619e..13d6de4 100644
|
|
--- configure.ac
|
|
+++ configure.ac
|
|
@@ -188,7 +188,7 @@ AM_CONDITIONAL(SYSTEMD_SERVICE, test "${enable_systemd_service}" != "no")
|
|
AC_ARG_WITH([dbus-busdir], AC_HELP_STRING([--with-dbus-busdir=DIR],
|
|
[path to D-Bus bus services directory]),
|
|
[path_dbus_busdir=${withval}])
|
|
-if (test "${enable_systemd_service}" != "no" && test -z "${path_dbus_busdir}"); then
|
|
+if (test -z "${path_dbus_busdir}"); then
|
|
AC_MSG_CHECKING([D-Bus bus services directory])
|
|
path_dbus_busdir="`$PKG_CONFIG --variable=system_bus_services_dir dbus-1`"
|
|
if (test -z "${path_dbus_busdir}"); then
|
|
|