From 928f3ce5fabcf1794a1843be442f366844d2b74c Mon Sep 17 00:00:00 2001
From: OBATA Akio <obache@wizdas.com>
Date: Sat, 8 Aug 2020 18:33:11 +0900
Subject: Fix to set DCOP_PATH properly

It is only used in dcop module and empty is unwanted situation,
so properly define it in dcop/CMakeLists.txt.
Rerevant header generation is also moved to there, and prevent
to define in main config.h file too.

Signed-off-by: OBATA Akio <obache@wizdas.com>
(cherry picked from commit 56c5973b6b33df77a7491b07411cbd772c0d5d79)
---
 CMakeLists.txt      | 1 -
 config.h.cmake      | 3 ---
 dcop/CMakeLists.txt | 6 ++++++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eba0a1549..ae92022f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1155,7 +1155,6 @@ endif ( WITH_TDEICONLOADER_DEBUG )
 ##### write configure files #####################
 
 configure_file( config.h.cmake config.h )
-configure_file( dcop/dcop-path.h.cmake dcop/dcop-path.h )
 configure_file( tdecore/kdemacros.h.cmake tdecore/kdemacros.h )
 configure_file( kjs/global.h.in kjs/global.h )
 configure_file( tdeio/kssl/ksslconfig.h.cmake tdeio/kssl/ksslconfig.h )
diff --git a/config.h.cmake b/config.h.cmake
index 86ff0491f..5c80c0921 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -15,9 +15,6 @@
 /* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
-/* Define where your dcop binary is */
-#cmakedefine DCOP_PATH "@DCOP_PATH@"
-
 /* Use su or sudo */
 #define DEFAULT_SUPER_USER_COMMAND "@DEFAULT_SUPER_USER_COMMAND@"
 
diff --git a/dcop/CMakeLists.txt b/dcop/CMakeLists.txt
index 7d2b46617..c93085a0b 100644
--- a/dcop/CMakeLists.txt
+++ b/dcop/CMakeLists.txt
@@ -30,6 +30,12 @@ link_directories(
 )
 
 
+##### Define where your dcop binary is ##########
+
+set( DCOP_PATH "${BIN_INSTALL_DIR}" )
+configure_file( dcop-path.h.cmake dcop-path.h )
+
+
 ##### headers ###################################
 
 install( FILES
-- 
cgit v1.2.1