summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSoapux <2375-Soapux@users.noreply.gitlab.freedesktop.org>2019-07-31 22:43:37 -0500
committerSoapux <2375-Soapux@users.noreply.gitlab.freedesktop.org>2019-08-01 16:11:01 -0500
commitced73d0fcbd2a54085a660d260482fc70d79bd5c (patch)
treed95765b2853c9e9b6526a279ae61e5e01cf81fb0
parent64b11314ea71b5e22edf4d968347489c5d5acd01 (diff)
Move D-Bus conf file to $(datadir)/dbus-1/system.d
Since D-Bus 1.9.18 configuration files installed by third-party should go in $(datadir)/dbus-1/system.d. The old location is for sysadmin overrides. Also check that we have recent enough D-Bus to use the new location. https://lists.freedesktop.org/archives/dbus/2015-July/016746.html
-rw-r--r--meson.build6
1 files changed, 5 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 050a2fc..2567bc7 100644
--- a/meson.build
+++ b/meson.build
@@ -146,7 +146,11 @@ polkit_gobject_dep = dependency('polkit-gobject-1')
crypt_dep = cc.find_library('crypt')
dbus_dep = dependency('dbus-1')
-dbus_conf_dir = join_paths(dbus_dep.get_pkgconfig_variable('sysconfdir', define_variable: ['sysconfdir', act_sysconfdir]), 'dbus-1', 'system.d')
+if dbus_dep.version().version_compare('>=1.9.18')
+ dbus_conf_dir = join_paths(dbus_dep.get_pkgconfig_variable('datadir', define_variable: ['datadir', act_datadir]), 'dbus-1', 'system.d')
+else
+ dbus_conf_dir = join_paths(dbus_dep.get_pkgconfig_variable('sysconfdir', define_variable: ['sysconfdir', act_sysconfdir]), 'dbus-1', 'system.d')
+endif
dbus_ifaces_dir = dbus_dep.get_pkgconfig_variable('interfaces_dir', define_variable: ['datadir', act_datadir])
dbus_sys_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', act_datadir])