diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-05-31 11:18:38 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-06-07 08:37:03 (GMT) |
| commit | cafd332caee4ddfc724dc1271edd1cf69516f3cd (patch) | |
| tree | 53763ccb8c0e46ee336ceaf9f8195fa78f7d39d1 /configure | |
| parent | 40b4a02516d0dc883354b04bc1360b346627e5f8 (diff) | |
| download | Qt-cafd332caee4ddfc724dc1271edd1cf69516f3cd.zip Qt-cafd332caee4ddfc724dc1271edd1cf69516f3cd.tar.gz Qt-cafd332caee4ddfc724dc1271edd1cf69516f3cd.tar.bz2 | |
Make symbian install to epocroot by default.
On symbian cross-compiling is the only way so the libraries and headers
are all stored in symbian-specific ways which is called EPOCROOT.
This change makes a configure without -prefix being passed in populate
the EPOCROOT on 'make install'.
When the user passes a prefix it will just do what a normal unix build
does on make install.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 26 |
1 files changed, 18 insertions, 8 deletions
@@ -3203,15 +3203,25 @@ fi #prefix if [ -z "$QT_INSTALL_PREFIX" ]; 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}" + if [ -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"` |