[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [plasma-pa] data: - Avoid install in root directory.
From:       Helio Chissini de Castro <helio () kde ! org>
Date:       2015-12-10 12:18:43
Message-ID: E1a70BH-000752-KD () scm ! kde ! org
[Download RAW message or body]

Git commit 18f469ee47fc8809fe54f5a744b0e0794ecc9aa0 by Helio Chissini de Ca=
stro.
Committed on 10/12/2015 at 12:17.
Pushed by helio into branch 'master'.

- Avoid install in root directory.
kde4-config --install data provided absolute path, instead of relative,
breaking install in a non root enabled path for the disable tools

M  +4    -2    data/CMakeLists.txt

http://commits.kde.org/plasma-pa/18f469ee47fc8809fe54f5a744b0e0794ecc9aa0

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 29a41b0..49e0fae 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -7,8 +7,10 @@ execute_process(COMMAND kde4-config --install data
 if (kde4config_failed)
     message(FAILED "Couldn't find kde4-config from kde4libs for kconf_upda=
te files")
 else()
-    install(FILES disable_kmix.upd DESTINATION ${KDE4_DATA_DIR}/kconf_upda=
te)
-    install(PROGRAMS plasmaVolumeDisableKMixAutostart.pl DESTINATION ${KDE=
4_DATA_DIR}/kconf_update)
+	execute_process(COMMAND kde4-config --prefix OUTPUT_VARIABLE KDE4_PREFIX =
OUTPUT_STRIP_TRAILING_WHITESPACE)
+	string(REPLACE "${KDE4_PREFIX}/" ""  KDE4_PROPER_DATA_DIR ${KDE4_DATA_DIR=
})
+	install(FILES disable_kmix.upd DESTINATION ${KDE4_PROPER_DATA_DIR}/kconf_=
update)
+	install(PROGRAMS plasmaVolumeDisableKMixAutostart.pl DESTINATION ${KDE4_P=
ROPER_DATA_DIR}/kconf_update)
 endif()
 install(FILES disable_kmix.upd DESTINATION ${KDE_INSTALL_DATADIR}/kconf_up=
date)
 install(PROGRAMS plasmaVolumeDisableKMixAutostart.pl DESTINATION ${KDE_INS=
TALL_DATADIR}/kconf_update)
[prev in list] [next in list] [prev in thread] [next in thread]