zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kconfig: align path to kconf_update properly

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2016-09-14 23:25:15 +02:00
parent 66f9de9039
commit 2ff0ef3dfd
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
recipes-kde/kf5/tier1/kconfig/files/0004-kconf_update-fix-paths.patch
View File

@@ -11,8 +11,7 @@ Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
src/kconf_update/CMakeLists.txt | 2 +-
src/kconf_update/kconf_update.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/kconf_update/CMakeLists.txt b/src/kconf_update/CMakeLists.txt
index 34419c7..a04c43a 100644
@@ -23,23 +22,10 @@ index 34419c7..a04c43a 100644
ecm_mark_nongui_executable(kconf_update)
-get_target_property(KCONF_UPDATE_EXECUTABLE kconf_update LOCATION)
+set(KCONF_UPDATE_EXECUTABLE ${KDE_INSTALL_LIBEXECDIR_KF5}/kconf_update)
+set(KCONF_UPDATE_EXECUTABLE ${CMAKE_INSTALL_FULL_LIBEXECDIR}/kf5/kconf_update)
configure_file(config-kconf.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kconf.h )
# Although this is mostly an internal binary (hence installing it in
diff --git a/src/kconf_update/kconf_update.cpp b/src/kconf_update/kconf_update.cpp
index 309bc3c..3ff5163 100644
--- a/src/kconf_update/kconf_update.cpp
+++ b/src/kconf_update/kconf_update.cpp
@@ -758,7 +758,7 @@ void KonfUpdate::gotScript(const QString &_script)
QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kconf_update/") + script);
if (path.isEmpty()) {
if (interpreter.isEmpty()) {
- path = CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/kconf_update_bin/" + script;
+ path = LIB_INSTALL_DIR "/kconf_update_bin/" + script;
if (!QFile::exists(path)) {
path = QStandardPaths::findExecutable(script);
}
--
1.9.3