diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-11-10 09:50:50 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-11-10 10:02:58 (GMT) |
| commit | 339f3d9ca43987dc2dba022ec964fa43c702cb12 (patch) | |
| tree | 49b5108c1863e400d3cf63a5586860694037d0db /configure | |
| parent | 606e15215b33b51a4bc716654388b8e9eaa647e6 (diff) | |
| download | Qt-339f3d9ca43987dc2dba022ec964fa43c702cb12.zip Qt-339f3d9ca43987dc2dba022ec964fa43c702cb12.tar.gz Qt-339f3d9ca43987dc2dba022ec964fa43c702cb12.tar.bz2 | |
Fixed a shell syntax error in configure
When you have EPOCROOT environment variable, but compiling for desktop
Linux, the configure script showed a shell syntax error and failed to set
the install prefix, making "install" target to install to the build
directory.
Task-number: QTBUG-15008
Reviewed-by: axis
Reviewed-by: Oswald Buddenhagen
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -3314,12 +3314,9 @@ if [ -z "$QT_INSTALL_PREFIX" ]; then if [ "$PLATFORM" != "$XPLATFORM" ]; then QT_INSTALL_PREFIX="${QT_INSTALL_PREFIX}-${CFG_ARCH}" fi - elif [ -d "$EPOCROOT" ]; then - case "$XPLATFORM" in *symbian*) - QT_INSTALL_PREFIX="$EPOCROOT/epoc32/" - QT_INSTALL_LIBS="$EPOCROOT/epoc32/release/armv5/lib/" - ;; - esac + elif [ -d "$EPOCROOT" ] && echo $XPLATFORM | grep symbian > /dev/null; then + QT_INSTALL_PREFIX="$EPOCROOT/epoc32/" + QT_INSTALL_LIBS="$EPOCROOT/epoc32/release/armv5/lib/" else QT_INSTALL_PREFIX="/usr/local/Trolltech/Qt-${QT_VERSION}" # the default install prefix is /usr/local/Trolltech/Qt-$QT_VERSION fi |