From: Ralf Habacker Date: Mon, 7 Jun 2010 12:23:44 +0000 (+0200) Subject: Keep in sync with autotools. X-Git-Tag: dbus-1.3.1~20 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e66dd0eeb504088cf21aadc2d071b641fc05e6bb;p=thirdparty%2Fdbus.git Keep in sync with autotools. --- diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index ff0a573a5..2417c4345 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -426,8 +426,8 @@ if (WIN32) set (DBUS_SESSION_BUS_DEFAULT_ADDRESS "tcp:host=localhost,port=12434") set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "tcp:host=localhost,port=12434") endif (DBUS_USE_NONCE_TCP_DEFAULT_ADDRESS) - set (DBUS_SYSTEM_CONFIG_FILE "etc/system.conf") - set (DBUS_SESSION_CONFIG_FILE "etc/session.conf") + set (DBUS_SYSTEM_CONFIG_FILE "etc/dbus-1/system.conf") + set (DBUS_SESSION_CONFIG_FILE "etc/dbus-1/session.conf") # bus-test expects a non empty string set (DBUS_USER "Administrator") set (DBUS_DATADIR "data")