[SM-Commit] GIT changes to master grimoire by Jaka Kranjc (21c5ca6fc5d7d75095831c587af737b22c20d7c2)

Jaka Kranjc scm at sourcemage.org
Tue Nov 13 15:56:32 EST 2007


GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 ChangeLog |    4 ++++
 FUNCTIONS |   10 ++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 21c5ca6fc5d7d75095831c587af737b22c20d7c2
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    FUNCTIONS: fixed QTDIR fallbacks

diff --git a/ChangeLog b/ChangeLog
index 55d2557..b272db8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-13 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* FUNCTIONS: added prepare_cmake_flags to ease their passing through
+	  depends calls, fixed QTDIR defaults and cleaned up some indentation
+
 2007-11-11 Arjan Bouter <abouter at sourcemage.org>
 	* windowmanagers/MAINTAINER: i'm replacing e-type as maintainer
 
diff --git a/FUNCTIONS b/FUNCTIONS
index 3e66ac4..f9fda6a 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -497,8 +497,9 @@ cmake_build() {
 }
 
 qt4_build() {
-  QTDIR=/usr
-  PATH=$QTDIR/bin/qt4:$PATH
+  [[ -z $QTDIR ]] && source /etc/profile.d/qt.sh
+  QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
+  PATH="$QTDIR/bin/qt4:$PATH"
   cmake_build
 }
 
@@ -517,10 +518,11 @@ function check_if_qt4_provider()
 # some spells an adapt the build process to either qt3 or qt4
 function build_qt3_or_4()
 {
-  QTDIR=$INSTALL_ROOT/usr
+  [[ -z $QTDIR ]] && source /etc/profile.d/qt.sh
+  QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
   if check_if_qt4_provider
   then
-    PATH=$QTDIR/bin/qt4:$PATH
+    PATH="$QTDIR/bin/qt4:$PATH"
   fi      &&
   qmake   &&
   make



More information about the SM-Commit mailing list