cmake: Set DBUS_*_CONFIG_FILE to be in datadir on Unix

The files were installed to the datadir (usually /usr/share) since
commit 70950325, but the macros used to implement dbus-daemon --system
and dbus-daemon --session still looked for them in the sysconfdir
(usually /etc).

Fixes: 70950325 "Adjust cmake build to match autoconf installation locations"
(cherry picked from commit 6c21072a1e7832783b77dfde8d95ddf1e5927b98)
Backported-from: dbus!267

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a29bddcfa87e40c1dd65d4f1111f8a368b92d5db..210e5311aed5e4762768b07071d2954c4193e48f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -610,10 +610,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(sysconfdir "")
-    set(configdir ${sysconfdir}/dbus-1 )
-    set(DBUS_SYSTEM_CONFIG_FILE  ${configdir}/system.conf)
-    set(DBUS_SESSION_CONFIG_FILE ${configdir}/session.conf)
+    set(DBUS_SYSTEM_CONFIG_FILE  ${DBUS_DATADIR}/system.conf)
+    set(DBUS_SESSION_CONFIG_FILE ${DBUS_DATADIR}/session.conf)
     set(DBUS_USER "messagebus")
     set(DBUS_TEST_USER "nobody")
   # For best security, assume that all non-Windows platforms can do