FUNCTIONS: build_qt3_or_4, qt4_cmake_build and qt4_build should not

source /etc/profile.d/qt.sh as that is for *qt3*

2 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 75d741467a..6c5f3787bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-28 Eric Sandall <sandalle@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@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 4fc5b6564b..268b833bdb 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