From a6f752e05b53944b1d2783edb87e7b2508958448 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Tue, 17 Nov 2015 14:25:23 +0100
Subject: [PATCH] Fix test-autolaunch test by generating session.conf in
 <build-dir>/share/dbus-1 for cmake.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92899
---
 cmake/bus/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt
index 0dcae65..7210a3f 100644
--- a/cmake/bus/CMakeLists.txt
+++ b/cmake/bus/CMakeLists.txt
@@ -4,12 +4,12 @@ SET(EFENCE "")
 SET(BUS_DIR ${CMAKE_SOURCE_DIR}/../bus)
 
 # config files for installation 
-CONFIGURE_FILE( "${BUS_DIR}/session.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/session.conf" IMMEDIATE @ONLY)
+CONFIGURE_FILE( "${BUS_DIR}/session.conf.in" "${CMAKE_BINARY_DIR}/share/dbus-1/session.conf" IMMEDIATE @ONLY)
 CONFIGURE_FILE( "${BUS_DIR}/legacy-config/session.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/legacy-config/session.conf" IMMEDIATE @ONLY)
 FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/session.d)
 
 if(NOT WIN32)
-    CONFIGURE_FILE( "${BUS_DIR}/system.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/system.conf" IMMEDIATE @ONLY)
+    CONFIGURE_FILE( "${BUS_DIR}/system.conf.in" "${CMAKE_BINARY_DIR}/share/dbus-1/system.conf" IMMEDIATE @ONLY)
     CONFIGURE_FILE( "${BUS_DIR}/legacy-config/system.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/legacy-config/system.conf" IMMEDIATE @ONLY)
     FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/system.d)
 endif()
@@ -95,13 +95,13 @@ set_target_properties(dbus-daemon PROPERTIES OUTPUT_NAME ${DBUS_DAEMON_NAME})
 set_target_properties(dbus-daemon PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
 
 install_targets(/bin dbus-daemon)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/session.conf DESTINATION share/dbus-1)
+install(FILES ${CMAKE_BINARY_DIR}/share/dbus-1/session.conf DESTINATION share/dbus-1)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/legacy-config/session.conf DESTINATION etc/dbus-1)
 install(DIRECTORY DESTINATION share/dbus-1/session.d)
 install(DIRECTORY DESTINATION share/dbus-1/services)
 
 if(NOT WIN32)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/system.conf DESTINATION share/dbus-1)
+    install(FILES ${CMAKE_BINARY_DIR}/share/dbus-1/system.conf DESTINATION share/dbus-1)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/legacy-config/system.conf DESTINATION etc/dbus-1)
     install(DIRECTORY DESTINATION share/dbus-1/system.d)
     install(DIRECTORY DESTINATION share/dbus-1/system-services)
-- 
1.8.4.5