summaryrefslogtreecommitdiff
path: root/x11/kdebase3/patches/patch-ep
blob: 01a3f354d959c85440cfe49ff94d8f73848d45ad (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
$NetBSD: patch-ep,v 1.4 2003/07/30 13:35:00 markd Exp $

--- startkde.orig	2003-07-14 08:10:07.000000000 +1200
+++ startkde
@@ -21,7 +21,7 @@ trap 'echo GOT SIGHUP' HUP
 #
 # * Then ksmserver is started which in turn starts
 #   1) the window manager (kwin)
-#   2) everything in $KDEDIR/share/autostart (kdesktop, kicker, etc.)
+#   2) everything in $KDEDIR/share/kde/autostart (kdesktop, kicker, etc.)
 #   3) the rest of the session.
 
 # The user's personal KDE directory is usually ~/.kde, but this setting
@@ -51,11 +51,11 @@ usr_odir=$HOME/.fonts/kde-override
 usr_fdir=$HOME/.fonts
 if test -n "$KDEDIRS"; then
   kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
-  sys_odir=$kdedirs_first/share/fonts/override
-  sys_fdir=$kdedirs_first/share/fonts
+  sys_odir=$kdedirs_first/share/kde/fonts/override
+  sys_fdir=$kdedirs_first/share/kde/fonts
 else
-  sys_odir=$KDEDIR/share/fonts/override
-  sys_fdir=$KDEDIR/share/fonts
+  sys_odir=$KDEDIR/share/kde/fonts/override
+  sys_fdir=$KDEDIR/share/kde/fonts
 fi
 
 # We run mkfontdir on the user's font dirs (if we have permission) to pick
@@ -70,7 +70,7 @@ test -d "$sys_fdir" && xset fp+ "$sys_fd
 
 #
 # Add any user-installed font directories to the X font path
-kde_fontsdir=$kdehome/share/fonts
+kde_fontsdir=$kdehome/share/kde/fonts
 kde_fontpaths=$kde_fontsdir/fontpaths
 
 if test -r "$kde_fontpaths" ; then