Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

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

New commits:
commit 36ff02552a4566e65ae677e958a6214283e83b60
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    FUNCTIONS: build_qt3_or_4, qt4_cmake_build and qt4_build should not
    source /etc/profile.d/qt.sh as that is for *qt3*

diff --git a/ChangeLog b/ChangeLog
index 75d7414..6c5f378 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-28 Eric Sandall <sandalle AT sourcemage.org>
+       * FUNCTIONS: build_qt3_or_4, qt4_cmake_build and qt4_build should not
+         source /etc/profile.d/qt.sh as that is for *qt3*
+
 2009-02-28 Vlad Glagolev <stealth AT sourcemage.org>
        * xfce/xfce.version: XFCE goes 4.6.0!
        * xfce/xfce4-settings: new spell, settings manager for the Xfce 
desktop
diff --git a/FUNCTIONS b/FUNCTIONS
index 4fc5b65..268b833 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -503,14 +503,12 @@ cmake_build() {
 }
 
 qt4_cmake_build() {
-  [[ -z $QTDIR ]] && source /etc/profile.d/qt.sh
   QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
   PATH="$QTDIR/bin/qt4:$PATH"
   cmake_build
 }
 
 qt4_build() {
-#  [[ -z $QTDIR ]] && source /etc/profile.d/qt.sh
   QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
   PATH="$QTDIR/bin/qt4:$PATH"
   qmake PREFIX=$INSTALL_ROOT/usr &&
@@ -532,11 +530,13 @@ function check_if_qt4_provider()
 # some spells an adapt the build process to either qt3 or qt4
 function build_qt3_or_4()
 {
-  [[ -z $QTDIR ]] && source /etc/profile.d/qt.sh
-  QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
   if check_if_qt4_provider
   then
+    QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
     PATH="$QTDIR/bin/qt4:$PATH"
+  else
+    [[ -z $QTDIR ]] && source /etc/profile.d/qt.sh
+    QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
   fi      &&
   qmake   &&
   make