summaryrefslogtreecommitdiffstats
path: root/FUNCTIONS
diff options
context:
space:
mode:
authorFlorian Franzmann2015-07-04 08:57:11 +0200
committerFlorian Franzmann2015-07-04 22:46:45 +0200
commit1078fb49fc61f7d015e0ddc2471517b765948b2f (patch)
tree233499f7f41d6e3764b3f52d76be8574f17c0ae4 /FUNCTIONS
parent9331fb8817c2a4cf80cb09b47e14060a67c7f90a (diff)
FUNCTIONS: do not cd explicitely into $SOURCE_DIRECTORY in qt5_build, qt4_build and cmake_build
Diffstat (limited to 'FUNCTIONS')
-rwxr-xr-xFUNCTIONS3
1 files changed, 0 insertions, 3 deletions
diff --git a/FUNCTIONS b/FUNCTIONS
index 7c70f0dbd7..eb49dacc8e 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -6,7 +6,6 @@ QT4DIR=$INSTALL_ROOT/opt/qt4
QT5DIR=$INSTALL_ROOT/opt/qt5
qt5_build() {
- cd $SOURCE_DIRECTORY &&
PATH="$QT5DIR/bin:$PATH"
export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
qmake PREFIX=$QT5DIR LIBDIR=$QT5DIR/lib \
@@ -541,7 +540,6 @@ function waf_install() {
# spells in several sections now need cmake or qt4
cmake_build() {
- cd "$SOURCE_DIRECTORY" &&
mkdir -p build &&
cd build &&
prepare_cmake_flags &&
@@ -573,7 +571,6 @@ qt4_cmake_build() {
}
qt4_build() {
- cd $SOURCE_DIRECTORY &&
PATH="$QT4DIR/bin:$PATH"
qmake PREFIX=$QT4DIR $OPTS *.pro &&
make