diff options
| author |   Dan Armak <danarmak@gentoo.org> | 2002-02-18 18:35:02 +0000 |
|---|---|---|
| committer | Dan Armak <danarmak@gentoo.org> | 2002-02-18 18:35:02 +0000 |
| commit | 4b8ff289861f3a28cffb79f3959a76b6504efa5e (patch) | |
| tree | 1c2a0606515f1cd2b2a76be663f81aad67f57fb8 /x11-base | |
| parent | make kde-i18n eclass more consistent (uses EXPORT_FUNCTIONS as it shuold). mi... (diff) | |
| download | gentoo-2-4b8ff289861f3a28cffb79f3959a76b6504efa5e.tar.gz gentoo-2-4b8ff289861f3a28cffb79f3959a76b6504efa5e.tar.bz2 gentoo-2-4b8ff289861f3a28cffb79f3959a76b6504efa5e.zip | |
added "source /etc/make.conf" to get the KDE?DIR setting when it's non-standard
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xfree/files/4.2.0-r5/Xsetup_0 | 3 | ||||
| -rw-r--r-- | x11-base/xfree/files/4.2.0-r6/Xsetup_0 | 11 |
2 files changed, 4 insertions, 10 deletions
diff --git a/x11-base/xfree/files/4.2.0-r5/Xsetup_0 b/x11-base/xfree/files/4.2.0-r5/Xsetup_0 index a8919175ae9d..d5d67d72294f 100644 --- a/x11-base/xfree/files/4.2.0-r5/Xsetup_0 +++ b/x11-base/xfree/files/4.2.0-r5/Xsetup_0 @@ -1,6 +1,6 @@ #!/bin/sh # $Xorg: Xsetup_0,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ -xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail +#xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail # --- Gentoo --- # create list of sessions for kdm @@ -12,6 +12,7 @@ done echo sessions: $sessions # update all kdmrcs located +source /etc/make.conf for dir in $KDE2DIR $KDE3DIR $KDE2LIBSDIR $KDE3LIBSDIR $KDEDIR ~/.kde /usr/kde/2 /usr/kde/3 /usr do diff --git a/x11-base/xfree/files/4.2.0-r6/Xsetup_0 b/x11-base/xfree/files/4.2.0-r6/Xsetup_0 index 84c38f705300..d5d67d72294f 100644 --- a/x11-base/xfree/files/4.2.0-r6/Xsetup_0 +++ b/x11-base/xfree/files/4.2.0-r6/Xsetup_0 @@ -1,6 +1,6 @@ #!/bin/sh # $Xorg: Xsetup_0,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ -xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail +#xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail # --- Gentoo --- # create list of sessions for kdm @@ -12,6 +12,7 @@ done echo sessions: $sessions # update all kdmrcs located +source /etc/make.conf for dir in $KDE2DIR $KDE3DIR $KDE2LIBSDIR $KDE3LIBSDIR $KDEDIR ~/.kde /usr/kde/2 /usr/kde/3 /usr do @@ -23,11 +24,3 @@ ${sessions}" kdmrc.orig > kdmrc rm kdmrc.orig done - -# needed for kdm to display a background -# this needs to be verified, and i implemented -# it this way to try and avoid stale lock/whatever -if [ -n "`ps -A | grep kdm`" ] ; then - eval `which kdmdesktop` -fi - |