[Lunar-commits] kdebase3: fix the kdm stuff so we can now install KDE3 and KDE4

[Florin Braescu]

commit 0edb18add418b03d8c5449b229d8f127e35ac3c0
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Sun Jan 13 23:29:07 2008 +0200

    kdebase3: fix the kdm stuff so we can now install KDE3 and KDE4
              on the same system.
    
    For now we must switch between them manually, before reboot. Maybe a
    better solution will come up in the future.
---
 kde3/base/kdebase3/BUILD      |    8 +++-----
 kde3/base/kdebase3/PRE_BUILD  |   11 +++++++++++
 kde3/base/kdebase3/init.d/kdm |    2 +-
 kde3/base/kdebase3/kde        |    3 ++-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/kde3/base/kdebase3/BUILD b/kde3/base/kdebase3/BUILD
index e02bd22..71e6ac6 100644
--- a/kde3/base/kdebase3/BUILD
+++ b/kde3/base/kdebase3/BUILD
@@ -5,13 +5,11 @@
 
   export LD_LIBRARY_PATH=${KDE_PREFIX:-$KDEDIR}/lib:${KDE_PREFIX:-$KDEDIR}/lib/kde3
 
-  cp -f $SCRIPT_DIRECTORY/kdm $SCRIPT_DIRECTORY/init.d/kdm  &&
-  TMP="s:KDEDIR:${KDE_PREFIX:-$KDEDIR}:"                    &&
-  sedit $TMP $SCRIPT_DIRECTORY/init.d/kdm                   &&
-
 # So it can find the headers.
   sedit "s:/usr/include/dbus-1.0:/usr/include/dbus-1.0/qt3/dbus:g" configure  &&
 
-  default_build
+  default_build  &&
+
+  install -m755 $SCRIPT_DIRECTORY/kde /usr/bin/
 
 ) > $C_FIFO 2>&1
diff --git a/kde3/base/kdebase3/PRE_BUILD b/kde3/base/kdebase3/PRE_BUILD
new file mode 100644
index 0000000..dd3d124
--- /dev/null
+++ b/kde3/base/kdebase3/PRE_BUILD
@@ -0,0 +1,11 @@
+rm -f $SCRIPT_DIRECTORY/init.d/kdm  &&
+echo "#!/bin/bash"           >> $SCRIPT_DIRECTORY/init.d/kdm  &&
+echo ""                      >> $SCRIPT_DIRECTORY/init.d/kdm  &&
+echo "# chkconfig: 5 95 05"  >> $SCRIPT_DIRECTORY/init.d/kdm  &&
+echo "# description: kdm is KDE's version of the xdm graphical login manager"  >> $SCRIPT_DIRECTORY/init.d/kdm  &&
+TMP="# processname: $MODULE_PREFIX/bin/kdm"  &&
+echo $TMP                            >> $SCRIPT_DIRECTORY/init.d/kdm  &&
+echo "# sigreload: HUP"              >> $SCRIPT_DIRECTORY/init.d/kdm  &&
+echo ""                              >> $SCRIPT_DIRECTORY/init.d/kdm  &&
+echo '. /lib/lsb/init-functions $1'  >> $SCRIPT_DIRECTORY/init.d/kdm  &&
+default_pre_build
diff --git a/kde3/base/kdebase3/init.d/kdm b/kde3/base/kdebase3/init.d/kdm
old mode 100755
new mode 100644
index fd0cc37..a1cbbb1
--- a/kde3/base/kdebase3/init.d/kdm
+++ b/kde3/base/kdebase3/init.d/kdm
@@ -2,7 +2,7 @@
 
 # chkconfig: 5 95 05
 # description: kdm is KDE's version of the xdm graphical login manager
-# processname: ${KDE_PREFIX:-$KDEDIR}/bin/kdm
+# processname: /opt/lunar/kde/bin/kdm
 # sigreload: HUP
 
 . /lib/lsb/init-functions $1
diff --git a/kde3/base/kdebase3/kde b/kde3/base/kdebase3/kde
old mode 100755
new mode 100644
index bdf8364..8f7b264
--- a/kde3/base/kdebase3/kde
+++ b/kde3/base/kdebase3/kde
@@ -1,2 +1,3 @@
 #!/bin/sh
-startkde
+$KDEDIR/bin/startkde
+