Allow packagers set kconfig_compiler install dir

Origin: Debian
Bug-Debian: https://bugs.debian.org/887452
Last-Update: 2018-01-25

Gbp-Pq: Name Allow-packagers-set-kconfig_compiler-install-dir.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 914b132831f769b8abfb3175dd4043e423799e52..96316b2584c9c7c67478ee7724d03c1ac25fc79b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,6 +74,9 @@ endif()
 include (ECMPoQmTools)
 ecm_install_po_files_as_qm(poqm)
 
+# allow kconfig_compiler install dir to be set as a configure argument
+set(KCONFIG_COMPILER_INSTALL_DIR "${KDE_INSTALL_LIBEXECDIR_KF}" CACHE STRING
+   "Set directory for kconfig compiler tool")
 
 # create a Config.cmake and a ConfigVersion.cmake file and install them
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF6Config")

diff --git a/src/kconfig_compiler/CMakeLists.txt b/src/kconfig_compiler/CMakeLists.txt
index e9cadf7af09caa8d2eb79cd03f7703fb86ff429c..a07f26804d39af0f3a1587d2aa32a1fc9976228c 100644 (file)
--- a/src/kconfig_compiler/CMakeLists.txt
+++ b/src/kconfig_compiler/CMakeLists.txt
@@ -25,4 +25,4 @@ target_link_libraries(kconfig_compiler Qt6::Xml)
 
 ecm_mark_nongui_executable(kconfig_compiler)
 
-install(TARGETS kconfig_compiler EXPORT KF6ConfigCompilerTargets DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF})
+install(TARGETS kconfig_compiler EXPORT KF6ConfigCompilerTargets DESTINATION ${KCONFIG_COMPILER_INSTALL_DIR})