diff options
Diffstat (limited to 'source/kde')
-rw-r--r-- | source/kde/kde/build/artikulate | 2 | ||||
-rw-r--r-- | source/kde/kde/build/kservice | 2 | ||||
-rwxr-xr-x | source/kde/kde/kde.SlackBuild | 2 | ||||
-rw-r--r-- | source/kde/kde/post-install/kservice/profile.d/kde.csh | 13 | ||||
-rw-r--r-- | source/kde/kde/post-install/kservice/profile.d/kde.sh | 14 |
5 files changed, 20 insertions, 13 deletions
diff --git a/source/kde/kde/build/artikulate b/source/kde/kde/build/artikulate index 0cfbf0888..00750edc0 100644 --- a/source/kde/kde/build/artikulate +++ b/source/kde/kde/build/artikulate @@ -1 +1 @@ -2 +3 diff --git a/source/kde/kde/build/kservice b/source/kde/kde/build/kservice index 00750edc0..b8626c4cf 100644 --- a/source/kde/kde/build/kservice +++ b/source/kde/kde/build/kservice @@ -1 +1 @@ -3 +4 diff --git a/source/kde/kde/kde.SlackBuild b/source/kde/kde/kde.SlackBuild index 459165b06..86b2bcd36 100755 --- a/source/kde/kde/kde.SlackBuild +++ b/source/kde/kde/kde.SlackBuild @@ -396,7 +396,7 @@ build_mod_pkg () { else cp -a \ AUTHORS* CONTRIBUTING* COPYING* HACKING* \ - INSTALL* MAINTAINERS README* NEWS* TODO* \ + INSTALL* LICENSE* MAINTAINERS README* NEWS* TODO* \ $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} # If there's a ChangeLog, installing at least part of the recent # history is useful, but don't let it get totally out of control: 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 a5bc081f6..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 +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 ced4a482b..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,7 +4,7 @@ KDEDIRS=/usr export KDEDIRS # Add KDE paths if they exist: -if [ -d /usr/lib/kf5 ]; then +if [ -d /usr/lib/libexec/kf5 ]; then PATH="$PATH:/usr/lib/libexec/kf5" fi if [ -d /usr/lib/kde4/libexec ]; then @@ -12,12 +12,16 @@ if [ -d /usr/lib/kde4/libexec ]; then 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: |