diff options
| author | Harald Fernengel <harald.fernengel@nokia.com> | 2010-11-10 10:10:46 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2010-11-10 10:10:46 (GMT) |
| commit | 05ed65f5c7334740c6bc1553d12cb0f4e9e2e3c8 (patch) | |
| tree | 593881d73b2450d3bb69ee6857efcc1a009101c2 | |
| parent | 7e1a598296e89e498fd0c27fc0951f059d1e6ffe (diff) | |
| parent | 339f3d9ca43987dc2dba022ec964fa43c702cb12 (diff) | |
| download | Qt-05ed65f5c7334740c6bc1553d12cb0f4e9e2e3c8.zip Qt-05ed65f5c7334740c6bc1553d12cb0f4e9e2e3c8.tar.gz Qt-05ed65f5c7334740c6bc1553d12cb0f4e9e2e3c8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into osl1-4.7
| -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 |