diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-18 20:03:20 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-18 20:03:20 +0100 |
commit | 3654a4a3c1cb2ac9bb8b486877d9f1e6a6b220be (patch) | |
tree | 611c16caa5096bd1348f188c9072354f1e613a9f /configure | |
parent | c04f3584abd621f09e8f2c81b9c6c87212a993a3 (diff) | |
parent | f4900d340a4c620b56871995741696d28e53c167 (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -2815,8 +2815,14 @@ if [ -z "$QT_INSTALL_BINS" ]; then #default fi QT_INSTALL_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_BINS"` +if [ "$XPLATFORM_MINGW" = "yes" ]; then + QT_INSTALL_LIBEXECS_DIRNAME="lib" +else + QT_INSTALL_LIBEXECS_DIRNAME="libexec" +fi + if [ -z "$QT_INSTALL_LIBEXECS" ]; then #default - QT_INSTALL_LIBEXECS="$QT_INSTALL_ARCHDATA/libexec" #fallback + QT_INSTALL_LIBEXECS="$QT_INSTALL_ARCHDATA/$$QT_INSTALL_LIBEXECS_DIRNAME" #fallback fi QT_INSTALL_LIBEXECS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBEXECS"` @@ -3038,7 +3044,7 @@ Installation options: -plugindir <dir> ...... Plugins will be installed to <dir> (default ARCHDATADIR/plugins) -libexecdir <dir> ..... Program executables will be installed to <dir> - (default ARCHDATADIR/libexec) + (default ARCHDATADIR/$QT_INSTALL_LIBEXECS_DIRNAME) -importdir <dir> ...... Imports for QML1 will be installed to <dir> (default ARCHDATADIR/imports) -qmldir <dir> ......... Imports for QML2 will be installed to <dir> |