summaryrefslogtreecommitdiffstats
path: root/FUNCTIONS
diff options
context:
space:
mode:
authorTreeve Jelbert2015-04-29 18:34:48 +0200
committerTreeve Jelbert2015-04-29 18:34:48 +0200
commite6a41b029f5125268d71dc94efc0b8f022a450ac (patch)
tree27bd0e1bbb7e2e102db510a80b5ffeaf930e0b03 /FUNCTIONS
parent6b19782e1f8b5499518d0390783d10d2311f2e88 (diff)
FUNCTIONS - fix qt4_build
Diffstat (limited to 'FUNCTIONS')
-rwxr-xr-xFUNCTIONS12
1 files changed, 6 insertions, 6 deletions
diff --git a/FUNCTIONS b/FUNCTIONS
index 0fc1d495db..e450b9d206 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -565,15 +565,15 @@ cmake_build() {
}
qt4_cmake_build() {
- QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
- PATH="$QTDIR/bin/qt4:$PATH"
- cmake_build
+ PATH="$QT4DIR/bin/:$PATH"
+ export PKG_CONFIG_PATH="$QT4DIR/lib/pkgconfig"
+ cmake_build $QT4DIR
}
qt4_build() {
- QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
- PATH="$QTDIR/bin/qt4:$PATH"
- qmake PREFIX=$INSTALL_ROOT/usr &&
+ cd $SOURCE_DIRECTORY &&
+ PATH="$QT4DIR/bin:$PATH"
+ qmake PREFIX=$QT4DIR $OPTS $SRC/*.pro &&
make
}