2 files changed, 19 insertions, 12 deletions
diff --git a/source/kde/kde/post-install/kservice/profile.d/kde.csh b/source/kde/kde/post-install/kservice/profile.d/kde.csh
index 59de8963e..6884c0f12 100644
--- a/source/kde/kde/post-install/kservice/profile.d/kde.csh
+++ b/source/kde/kde/post-install/kservice/profile.d/kde.csh
@@ -5,18 +5,21 @@ if ( ! $?KDEDIRS ) then
 endif
 
 # Add KDE paths if they exist:
-if ( -d /usr/lib/kf5 ) then
-    setenv PATH ${PATH}:/usr/lib/kf5
+if ( -d /usr/lib/libexec/kf5 ) then
+    setenv PATH ${PATH}:/usr/lib/libexec/kf5
 endif
 if ( -d /usr/lib/kde4/libexec ) then
     setenv PATH ${PATH}:/usr/lib/kde4/libexec
 endif
 
-# Add /etc/kde/xdg to $XDG_CONFIG_DIRS:
-if ( $?XDG_CONFIG_DIRS ) then
+# If there's no $XDG_CONFIG_DIRS variable, set it to /etc/xdg:
+if ( ! $?XDG_CONFIG_DIRS ) then
+    setenv XDG_CONFIG_DIRS /etc/xdg
+endif
+
+# Add /etc/kde/xdg to $XDG_CONFIG_DIRS (if it exists):
+if ( -d /etc/kde/xdg ) then
     setenv XDG_CONFIG_DIRS ${XDG_CONFIG_DIRS}:/etc/kde/xdg
-else
-    setenv XDG_CONFIG_DIRS /etc/xdg:/etc/kde/xdg
 endif
 
 # Commented out, since PAM should take care of this:
diff --git a/source/kde/kde/post-install/kservice/profile.d/kde.sh b/source/kde/kde/post-install/kservice/profile.d/kde.sh
index 48bf44090..8b7c3e37b 100644
--- a/source/kde/kde/post-install/kservice/profile.d/kde.sh
+++ b/source/kde/kde/post-install/kservice/profile.d/kde.sh
@@ -4,20 +4,24 @@ KDEDIRS=/usr
 export KDEDIRS
 
 # Add KDE paths if they exist:
-if [ -d /usr/lib/kf5 ]; then
-  PATH="$PATH:/usr/lib/kf5"
+if [ -d /usr/lib/libexec/kf5 ]; then
+  PATH="$PATH:/usr/lib/libexec/kf5"
 fi
 if [ -d /usr/lib/kde4/libexec ]; then
   PATH="$PATH:/usr/lib/kde4/libexec"
 fi
 export PATH
 
-# Add /etc/kde/xdg to $XDG_CONFIG_DIRS:
-if [ ! "$XDG_CONFIG_DIRS" = "" ]; then
+# If there's no $XDG_CONFIG_DIRS variable, set it to /etc/xdg:
+if [ -z "$XDG_CONFIG_DIRS" ]; then
+  XDG_CONFIG_DIRS=/etc/xdg
+fi
+
+# Add /etc/kde/xdg to $XDG_CONFIG_DIRS (if it exists):
+if [ -d /etc/kde/xdg ]; then
   XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/kde/xdg
-else
-  XDG_CONFIG_DIRS=/etc/xdg:/etc/kde/xdg
 fi
+
 export XDG_CONFIG_DIRS
 
 # Commented out, since PAM should take care of this: