install kde5* to /usr

3 files changed, 6 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ed9ca257a..babe25359b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2020-02-14 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* utils/ddate: new spell, converts Gregorian dates to Discordian dates
 
+2020-02-13 Treeve Jelbert <treeve@sourcemage.org>
+	* FUNCTIONS KDE5_FUNCTIONS: install kde5* to /usr
+
 2020-02-12 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* utils/lsix: new spell, like ls but for images
 
diff --git a/FUNCTIONS b/FUNCTIONS
index 03a9822424..a2cd357162 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -16,9 +16,7 @@ qt5_build() {
 
 function qt5_cmake_build() {
   PATH="$QT5DIR/bin/:$PATH"                      &&
-  export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig" &&
-  export CMAKE_PREFIX_PATH="$QT5DIR/lib/cmake"   &&
-  cmake_build ${1-$QT5DIR}
+  cmake_build
 }
 
 
diff --git a/KDE5_FUNCTIONS b/KDE5_FUNCTIONS
index ba2a763b99..302b4c6f99 100755
--- a/KDE5_FUNCTIONS
+++ b/KDE5_FUNCTIONS
@@ -1,5 +1,5 @@
-KF5DIR=$QT5DIR
-export XDG_DATA_DIRS=$KF5DIR/share:/usr/share
+KF5DIR="$INSTALL_ROOT/usr"
+export XDG_DATA_DIRS=/usr/share
 
 #---------------------------------------------------------------------
 function kde5_build() {