From 11d626de5fd87fc8cbd9d685bde8217c7ad7fae6 Mon Sep 17 00:00:00 2001 From: axis Date: Wed, 21 Jul 2010 16:13:58 +0200 Subject: Made developer builds use the build dir as prefix, also on Symbian. Otherwise it is not possible to build projects outside of the Qt tree without installing Qt to the SDK first. Task: QTBUG-11727 RevBy: Trust me --- configure | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 11496c4..075dfb3 100755 --- a/configure +++ b/configure @@ -3216,25 +3216,21 @@ fi #prefix if [ -z "$QT_INSTALL_PREFIX" ]; then - if [ -d "$EPOCROOT" ]; then + if [ "$CFG_DEV" = "yes" ]; then + QT_INSTALL_PREFIX="$outpath" # In Development, we use sandboxed builds by default + elif [ "$PLATFORM_QWS" = "yes" ]; then + QT_INSTALL_PREFIX="/usr/local/Trolltech/QtEmbedded-${QT_VERSION}" + 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 - fi - - if [ -z "$QT_INSTALL_PREFIX" ]; then # still empty - if [ "$CFG_DEV" = "yes" ]; then - QT_INSTALL_PREFIX="$outpath" # In Development, we use sandboxed builds by default - elif [ "$PLATFORM_QWS" = "yes" ]; then - QT_INSTALL_PREFIX="/usr/local/Trolltech/QtEmbedded-${QT_VERSION}" - if [ "$PLATFORM" != "$XPLATFORM" ]; then - QT_INSTALL_PREFIX="${QT_INSTALL_PREFIX}-${CFG_ARCH}" - fi - else - QT_INSTALL_PREFIX="/usr/local/Trolltech/Qt-${QT_VERSION}" # the default install prefix is /usr/local/Trolltech/Qt-$QT_VERSION - fi + else + QT_INSTALL_PREFIX="/usr/local/Trolltech/Qt-${QT_VERSION}" # the default install prefix is /usr/local/Trolltech/Qt-$QT_VERSION fi fi QT_INSTALL_PREFIX=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_PREFIX"` -- cgit v0.12