From: Alex Richardson <arichardson.kde@gmail.com>
Date: Fri, 1 Apr 2022 11:09:45 +0000 (+0000)
Subject: cmake: Correct DBUS_{SYSTEM,SESSION}_CONFIG_FILE on UNIX systems
X-Git-Tag: dbus-1.15.0~75^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4876e7cb5815f5d329f9517d96a1df88688cf9f;p=thirdparty%2Fdbus.git

cmake: Correct DBUS_{SYSTEM,SESSION}_CONFIG_FILE on UNIX systems

We always install to a dbus-1 subdir, but the path encoded in the binary
was missing the dbus-1/ subdirectory, so we end up getting errors when
trying to load it.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99f102c53..c7fc6f2ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -625,8 +625,8 @@ if(WIN32)
 else(WIN32)
     set(DBUS_SESSION_BUS_LISTEN_ADDRESS "unix:tmpdir=${DBUS_SESSION_SOCKET_DIR}" CACHE STRING "session bus default listening address")
     set(DBUS_SESSION_BUS_CONNECT_ADDRESS "autolaunch:" CACHE STRING "session bus fallback address for clients")
-    set(DBUS_SYSTEM_CONFIG_FILE  ${DBUS_DATADIR}/system.conf)
-    set(DBUS_SESSION_CONFIG_FILE ${DBUS_DATADIR}/session.conf)
+    set(DBUS_SYSTEM_CONFIG_FILE  ${DBUS_DATADIR}/dbus-1/system.conf)
+    set(DBUS_SESSION_CONFIG_FILE ${DBUS_DATADIR}/dbus-1/session.conf)
     set(DBUS_USER "messagebus")
     set(DBUS_TEST_USER "nobody")
   # For best security, assume that all non-Windows platforms can do