summaryrefslogtreecommitdiffstats
path: root/FUNCTIONS
diff options
context:
space:
mode:
authorTreeve Jelbert2020-03-16 13:28:45 +0100
committerTreeve Jelbert2020-03-31 09:27:04 +0200
commit163928ffd4f1e63078de50599289801b7a3883b9 (patch)
tree59e3f6fbd4902c1ab5221a7e56095658c471c6fd /FUNCTIONS
parent64d01076618b6dd8b7c737619c32a9d2b4a2377d (diff)
FUNCTIONS - install qt5 to /usr
Diffstat (limited to 'FUNCTIONS')
-rwxr-xr-xFUNCTIONS6
1 files changed, 1 insertions, 5 deletions
diff --git a/FUNCTIONS b/FUNCTIONS
index c9392fbee6..5b98f7329e 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -3,20 +3,16 @@
. $GRIMOIRE/config_query_multi.function
QT4DIR=$INSTALL_ROOT/opt/qt4
-QT5DIR=$INSTALL_ROOT/opt/qt5
+QT5DIR=$INSTALL_ROOT/usr
qt5_build() {
- PATH="$QT5DIR/bin:$PATH"
# qmake uses its own flag settings
- export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
qmake QMAKE_CONFIG="$OPTS" QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS"\
PREFIX=${1-$QT5DIR} LIBDIR=$QT5DIR/lib *.pro &&
make
}
function qt5_cmake_build() {
- PATH="$QT5DIR/bin/:$PATH" &&
- export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig" &&
cmake_build
}