From d4d001c7713f97489cc099ac768db04653b2f0b5 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 13 May 2022 15:36:42 +0200 Subject: [PATCH] build/meson: honor prefix for dbus_conf_dir Otherwise, we will try to install "src/nm-dispatcher/nm-dispatcher.conf" to "/usr/share/dbus-1/system.d", which is not correct, when we want a separate prefix. --- configure.ac | 3 ++- meson.build | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 7f4d661227..953b41b2b4 100644 --- a/configure.ac +++ b/configure.ac @@ -746,7 +746,6 @@ AC_SUBST(GLIB_MKENUMS) AC_ARG_WITH(dbus-sys-dir, AS_HELP_STRING([--with-dbus-sys-dir=DIR], [where D-BUS system.d directory is])) - if test -n "$with_dbus_sys_dir" ; then DBUS_SYS_DIR="$with_dbus_sys_dir" else @@ -1363,6 +1362,7 @@ echo " exec_prefix: $exec_prefix" echo " sysconfdir: $sysconfdir" echo " localstatedir: $localstatedir" echo " runstatedir: $runstatedir" +echo " datarootdir: $datarootdir" echo " datadir: $datadir" echo " systemdunitdir: $with_systemdsystemunitdir" echo " udev-dir: $with_udev_dir" @@ -1373,6 +1373,7 @@ echo " nmdatadir: $nmdatadir" echo " nmstatedir: $nmstatedir" echo " nmrundir: $nmrundir" echo " system-ca-path: $with_system_ca_path" +echo " dbus-sys-dir: $DBUS_SYS_DIR" echo echo "Platform:" diff --git a/meson.build b/meson.build index f07408c1a5..76cb117984 100644 --- a/meson.build +++ b/meson.build @@ -555,7 +555,7 @@ endif dbus_conf_dir = get_option('dbus_conf_dir') if dbus_conf_dir == '' assert(dbus_dep.found(), 'D-Bus required but not found, please provide a valid system bus config dir') - dbus_conf_dir = join_paths(dbus_dep.get_pkgconfig_variable('datadir'), 'dbus-1', 'system.d') + dbus_conf_dir = join_paths(dbus_dep.get_pkgconfig_variable('datarootdir', define_variable: ['prefix', nm_prefix]), 'dbus-1', 'system.d') endif dbus_interfaces_dir = dbus_dep.get_pkgconfig_variable('interfaces_dir', define_variable: ['datadir', nm_datadir]) @@ -1026,7 +1026,8 @@ output += ' nmstatedir: ' + nm_pkgstatedir + '\n' output += ' nmrundir: ' + nm_pkgrundir + '\n' output += ' nmvpndir: ' + nm_vpndir + '\n' output += ' nmplugindir: ' + nm_plugindir + '\n' -output += ' system-ca-path: ' + system_ca_path + '\n' +output += ' system_ca_path: ' + system_ca_path + '\n' +output += ' dbus_conf_dir: ' + dbus_conf_dir + '\n' output += '\nPlatform:\n' output += ' session tracking: ' + ','.join(session_trackers) + '\n' output += ' suspend/resume: ' + suspend_resume + '\n'