Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (21c5ca6fc5d7d75095831c587af737b22c20d7c2)
  • Date: Tue, 13 Nov 2007 14:56:32 -0600

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



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (21c5ca6fc5d7d75095831c587af737b22c20d7c2), Jaka Kranjc, 11/13/2007

Archive powered by MHonArc 2.6.24.

Top of Page