Commit b865b022 authored by Christian Kellner's avatar Christian Kellner

meson: install dbus configuration file in datadir

Install the org.freedesktop.bolt.conf not in sysconfdir but in
datadir. The former is deprecated and the latter is the standard
preferred way. I quote from the man page of dbus-daemon(1):

  The standard system bus normally reads additional XML files from
  /usr/share/dbus-1/system.d. Third-party packages should install the
  default policies necessary for correct operation into that
  directory, which has been supported since dbus 1.10 (released in
  2015).
  Third-party packages would historically install XML files into
  /etc/dbus-1/system.d, but this practice is now considered to be
  deprecated: that directory should be treated as reserved for the
  system administrator.

Adapt the contrib/bolt.spec.in file accordingly.
parent 9be80ad4
......@@ -77,7 +77,7 @@ where thunderbolt domains and devices can be simulated.
%{_libexecdir}/boltd
%{_unitdir}/%{name}.service
%{_udevrulesdir}/*-%{name}.rules
%{_sysconfdir}/dbus-1/system.d/org.freedesktop.bolt.conf
%{_datadir}/dbus-1/system.d/org.freedesktop.bolt.conf
%{_datadir}/dbus-1/interfaces/org.freedesktop.bolt.xml
%{_datadir}/polkit-1/actions/org.freedesktop.bolt.policy
%{_datadir}/polkit-1/rules.d/org.freedesktop.bolt.rules
......
......@@ -270,7 +270,7 @@ install_data(['data/org.freedesktop.bolt.xml'],
)
install_data(['data/org.freedesktop.bolt.conf'],
install_dir : join_paths(sysconfdir, 'dbus-1', 'system.d')
install_dir : join_paths(datadir, 'dbus-1', 'system.d')
)
service_file = configure_file(
......@@ -531,6 +531,7 @@ run_target('uncrustify',
msg = ['',
'version: @0@'.format(meson.project_version()),
'sysconfdir: @0@'.format(sysconfdir),
'datadir: @0@'.format(datadir),
'statedir: @0@'.format(statedir),
'db name: @0@'.format(dbname),
'database path: @0@'.format(dbdir),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment