From 4c75a168e34fde289dafab7d7ba4ba1bfbfe77b8 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 9 Oct 2025 16:10:17 +0100 Subject: [PATCH] meson: switch default dbus_config_dir to /usr/share/dbus-1/ Upstream/vendor configuration files should be installed under /usr/, so that local users/admins can install overrides in /etc/. Distributions like Ubuntu are already manually configuring this, so just make it the default. --- meson.build | 2 +- meson_options.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 187d04ca..117824ca 100644 --- a/meson.build +++ b/meson.build @@ -126,7 +126,7 @@ endif dbus_config_dir = get_option('dbus_config_dir') if dbus_config_dir == '' - dbus_config_dir = get_option('sysconfdir') / 'dbus-1' / 'system.d' + dbus_config_dir = get_option('datadir') / 'dbus-1' / 'system.d' endif dbus_service_dir = get_option('dbus_service_dir') diff --git a/meson_options.txt b/meson_options.txt index c4f34c2d..31797b1f 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -16,7 +16,7 @@ option( option( 'dbus_config_dir', type : 'string', - description : 'directory for D-Bus system configuration [$sysconfdir/dbus-1/system.d]', + description : 'directory for D-Bus system configuration [$datadir/dbus-1/system.d]', value : '', ) option(