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.

(cherry picked from commit f4876e7cb5815f5d329f9517d96a1df88688cf9f)
Backported-from: dbus!297

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc4926e3a0b602399cc3a5743b74b1ecf69fbc28..98904504c5aa658a2de05b8e67324c08e7a1c125 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -621,8 +621,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