PolicyKit: Branch 'master' - 2 commits

[GitLab Mirror]

 data/Makefile.am |    2 +-
 meson.build      |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 265f0d54b83f0c9f0d66c88f132ef385117e1b97
Merge: d05a167 273357a
Author: Jan Rybar <jrybar at redhat.com>
Date:   Tue Jan 5 11:37:51 2021 +0000

    Merge branch 'mbiebl/polkit-dbus-policy' into 'master'
    
    Mbiebl/polkit dbus policy
    
    See merge request polkit/polkit!72

commit 273357a39520423b2074e7d664f83922ad047176
Author: Jan Rybar <jrybar at redhat.com>
Date:   Tue Jan 5 11:37:51 2021 +0000

    Move D-Bus policy file to /usr/share/dbus-1/system.d/
    
    To better support stateless systems with an empty /etc, the old location
    in /etc/dbus-1/system.d/ should only be used for local admin changes.
    Package provided D-Bus policy files are supposed to be installed in
    /usr/share/dbus-1/system.d/.
    
    This is supported since dbus 1.9.18.
    
    https://lists.freedesktop.org/archives/dbus/2015-July/016746.html

diff --git a/data/Makefile.am b/data/Makefile.am
index f5ee4ba..e805260 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -15,7 +15,7 @@ $(service_DATA): $(service_in_files) Makefile
 
 # ----------------------------------------------------------------------------------------------------
 
-dbusconfdir = $(sysconfdir)/dbus-1/system.d
+dbusconfdir = $(datadir)/dbus-1/system.d
 dbusconf_in_files = org.freedesktop.PolicyKit1.conf.in
 dbusconf_DATA = $(dbusconf_in_files:.conf.in=.conf)
 
diff --git a/meson.build b/meson.build
index 6997e7f..ed75c61 100644
--- a/meson.build
+++ b/meson.build
@@ -129,8 +129,8 @@ assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t fin
 mozjs_dep = dependency('mozjs-78')
 
 dbus_dep = dependency('dbus-1')
-dbus_sysconfdir = dbus_dep.get_pkgconfig_variable('sysconfdir', define_variable: ['sysconfdir', pk_prefix / pk_sysconfdir])
-dbus_policydir = dbus_sysconfdir / 'dbus-1/system.d'
+dbus_confdir = dbus_dep.get_pkgconfig_variable('datadir', define_variable: ['datadir', pk_prefix / pk_datadir])   #changed from sysconfdir with respect to commit#8eada3836465838
+dbus_policydir = dbus_confdir / 'dbus-1/system.d'
 dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir])
 
 # check OS