[Lunar-commits] <moonbase> kdelibs4, kdebase4-runtime: This is better.

[Dennis `stumbles` Veatch]

commit adfea42ce4e0e535dc218b4352c91fa76722a37a
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Wed Sep 1 13:26:03 2010 -0400

    kdelibs4, kdebase4-runtime: This is better.
---
 kde4/base/kdebase4-runtime/BUILD |   22 +++++++++++-----------
 kde4/base/kdelibs4/BUILD         |   15 ++++++++-------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/kde4/base/kdebase4-runtime/BUILD b/kde4/base/kdebase4-runtime/BUILD
index 2714e74..f6ef4fc 100644
--- a/kde4/base/kdebase4-runtime/BUILD
+++ b/kde4/base/kdebase4-runtime/BUILD
@@ -1,23 +1,23 @@
 (
 
-  KDE4_BUILD_DIR="$SOURCE_DIRECTORY/kde4-build"  &&
+   source /etc/profile.d/qt4.rc   &&
+   source /etc/profile.d/kde4.rc  &&
 
-  source /etc/profile.d/qt4.rc   &&
-  source /etc/profile.d/kde4.rc  &&
+   OOSB_DIR="$SOURCE_DIRECTORY/$MODULE-build"  &&
 
-  mkdir $KDE4_BUILD_DIR  &&
-  cd $KDE4_BUILD_DIR     &&
+   mkdir $OOSB_DIR  &&
+   cd $OOSB_DIR     &&
 
-  cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX  \
+   cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX  \
                            -DCMAKE_BUILD_TYPE=RELEASE             \
                            $OPTS                                 &&
 
-  default_make &&
+   default_make &&
 
-# This used to be installed by kdelibs4 but will be over written by 
-# kdebase4-runtime causing a conflict. So lets just move it here from 
-# kdelibs4 and be done with it.
+ # This used to be installed by kdelibs4 but will be over written by 
+ # kdebase4-runtime causing a conflict. So lets just move it here from 
+ # kdelibs4 and be done with it.
 
-  install -m0755 $SCRIPT_DIRECTORY/kde4 /usr/bin/
+   install -m0755 $SCRIPT_DIRECTORY/kde4 /usr/bin/
 
 ) > $C_FIFO 2>&1
diff --git a/kde4/base/kdelibs4/BUILD b/kde4/base/kdelibs4/BUILD
index 1b6f79b..b781bf2 100644
--- a/kde4/base/kdelibs4/BUILD
+++ b/kde4/base/kdelibs4/BUILD
@@ -1,23 +1,24 @@
 (
 
-  KDE4_BUILD_DIR="$SOURCE_DIRECTORY/kde4-build"  &&
-
   source /etc/profile.d/qt4.rc   &&
   source /etc/profile.d/kde4.rc  &&
 
+  OOSB_DIR="$SOURCE_DIRECTORY/$MODULE-build"  &&
+
   if in_depends $MODULE polkit-qt-1 ; then
     OPTS="-DKAUTH_BACKEND=PolkitQt-1"
   fi &&
 
-  mkdir $KDE4_BUILD_DIR  &&
-  cd $KDE4_BUILD_DIR     &&
+  sed -i "22i /usr/share/sgml/docbook/xml/4.2" cmake/modules/FindDocBookXML.cmake &&
+  sedit "s:docbook/xsl-stylesheets:docbook/xsl-stylesheets-1.75.2:" cmake/modules/FindDocBookXSL.cmake &&
+
+  mkdir $OOSB_DIR  &&
+  cd $OOSB_DIR     &&
 
   cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX  \
                            -DCMAKE_BUILD_TYPE=RELEASE             \
                            $OPTS                                 &&
 
-  default_make  &&
-
-  install -m0755 $SCRIPT_DIRECTORY/kde4 /usr/bin/
+  default_make
 
 ) > $C_FIFO 2>&1