From 4712b0e99fdb90b6cbfe12ad16e534b49cd98343 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 24 Sep 2012 14:30:45 +0200 Subject: Add -archdatadir and change some of the default install dirs in Qt 5. Architecture-depedent Qt data defaults now to something under -archdatadir. Architecture-dependent data is everything that contains machine code (e.g., plugins) as well as anything that hardcodes build-specific data, like qconfig.pri and qmodule.pri. That is: QML imports: $archdatadir/imports (includes plugins) Qt plugins: $archdatadir/plugins (machine code) Mkspecs: $archdatadir/mkspecs (build-specific) Architecture-independent Qt data defaults now to something under -datadir. This option existed in Qt 4, but did not differentiate between arch-dependent and independent. Following Autoconf's lead, --datadir is the *independent* data root. translations: $datadir/translations (.qm files are arch-independent) docs: $datadir/doc By default, both new options are equal to the Qt install prefix. (Strictly speaking, for complete Autoconf compatibility, we'd need a --datarootdir=$prefix/share, --datadir=$datarootdir/qt5 and --docdir=$datarootdir/doc/qt5, but that's just nitpicking and unnecessary) Change-Id: I39c886a6a2d2d2c0b11923c50974179e21f2af76 Reviewed-by: Oswald Buddenhagen --- configure | 60 ++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 24 deletions(-) (limited to 'configure') diff --git a/configure b/configure index d3df651a7b..a90b06d978 100755 --- a/configure +++ b/configure @@ -884,6 +884,7 @@ QT_INSTALL_LIBS= QT_INSTALL_BINS= QT_INSTALL_PLUGINS= QT_INSTALL_IMPORTS= +QT_INSTALL_ARCHDATA= QT_INSTALL_DATA= QT_INSTALL_TRANSLATIONS= QT_INSTALL_SETTINGS= @@ -992,7 +993,7 @@ while [ "$#" -gt 0 ]; do VAL=no ;; #Qt style options that pass an argument - -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig) + -prefix|-docdir|-headerdir|-plugindir|-importdir|-archdatadir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` shift VAL="$1" @@ -1207,6 +1208,9 @@ while [ "$#" -gt 0 ]; do importdir) QT_INSTALL_IMPORTS="$VAL" ;; + archdatadir) + QT_INSTALL_ARCHDATA="$VAL" + ;; datadir) QT_INSTALL_DATA="$VAL" ;; @@ -2772,11 +2776,6 @@ if [ -z "$QT_INSTALL_PREFIX" ]; then fi QT_INSTALL_PREFIX=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_PREFIX"` -if [ -z "$QT_INSTALL_DOCS" ]; then #default - QT_INSTALL_DOCS="$QT_INSTALL_PREFIX/doc" #fallback -fi -QT_INSTALL_DOCS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DOCS"` - if [ -z "$QT_INSTALL_HEADERS" ]; then #default QT_INSTALL_HEADERS="$QT_INSTALL_PREFIX/include" fi @@ -2787,28 +2786,38 @@ if [ -z "$QT_INSTALL_LIBS" ]; then #default fi QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"` +if [ -z "$QT_INSTALL_ARCHDATA" ]; then #default + QT_INSTALL_ARCHDATA="$QT_INSTALL_PREFIX" #fallback +fi +QT_INSTALL_ARCHDATA=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_ARCHDATA"` + +if [ -z "$QT_INSTALL_DATA" ]; then #default + QT_INSTALL_DATA="$QT_INSTALL_PREFIX" #fallback +fi +QT_INSTALL_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DATA"` + if [ -z "$QT_INSTALL_BINS" ]; then #default QT_INSTALL_BINS="$QT_INSTALL_PREFIX/bin" #fallback fi QT_INSTALL_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_BINS"` +if [ -z "$QT_INSTALL_DOCS" ]; then #default + QT_INSTALL_DOCS="$QT_INSTALL_DATA/doc" #fallback +fi +QT_INSTALL_DOCS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DOCS"` + if [ -z "$QT_INSTALL_PLUGINS" ]; then #default - QT_INSTALL_PLUGINS="$QT_INSTALL_PREFIX/plugins" #fallback + QT_INSTALL_PLUGINS="$QT_INSTALL_ARCHDATA/plugins" #fallback fi QT_INSTALL_PLUGINS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_PLUGINS"` if [ -z "$QT_INSTALL_IMPORTS" ]; then #default - QT_INSTALL_IMPORTS="$QT_INSTALL_PREFIX/imports" #fallback + QT_INSTALL_IMPORTS="$QT_INSTALL_ARCHDATA/imports" #fallback fi QT_INSTALL_IMPORTS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_IMPORTS"` -if [ -z "$QT_INSTALL_DATA" ]; then #default - QT_INSTALL_DATA="$QT_INSTALL_PREFIX" -fi -QT_INSTALL_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DATA"` - if [ -z "$QT_INSTALL_TRANSLATIONS" ]; then #default - QT_INSTALL_TRANSLATIONS="$QT_INSTALL_PREFIX/translations" + QT_INSTALL_TRANSLATIONS="$QT_INSTALL_DATA/translations" #fallback fi QT_INSTALL_TRANSLATIONS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_TRANSLATIONS"` @@ -2855,7 +2864,7 @@ if [ -z "$QT_HOST_DATA" ]; then #default if $haveHpx; then QT_HOST_DATA="$QT_HOST_PREFIX" else - QT_HOST_DATA="$QT_INSTALL_DATA" + QT_HOST_DATA="$QT_INSTALL_ARCHDATA" fi else QT_HOST_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_HOST_DATA"` @@ -2995,20 +3004,22 @@ Installation options: -bindir ......... Executables will be installed to (default PREFIX/bin) - -libdir ......... Libraries will be installed to - (default PREFIX/lib) - -docdir ......... Documentation will be installed to - (default PREFIX/doc) -headerdir ...... Headers will be installed to (default PREFIX/include) + -libdir ......... Libraries will be installed to + (default PREFIX/lib) + -archdatadir ..... Arch-dependent data used by Qt will be installed to + (default PREFIX) -plugindir ...... Plugins will be installed to - (default PREFIX/plugins) + (default ARCHDATADIR/plugins) -importdir ...... Imports for QML will be installed to - (default PREFIX/imports) - -datadir ........ Data used by Qt programs will be installed to + (default ARCHDATADIR/imports) + -datadir ........ Arch-independent data used by Qt will be installed to (default PREFIX) + -docdir ......... Documentation will be installed to + (default DATADIR/doc) -translationdir . Translations of Qt programs will be installed to - (default PREFIX/translations) + (default DATADIR/translations) -sysconfdir ..... Settings used by Qt programs will be looked for in (default PREFIX/etc/settings) -examplesdir .... Examples will be installed to @@ -3486,6 +3497,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { "qt_binspath=$QT_INSTALL_BINS", "qt_plugpath=$QT_INSTALL_PLUGINS", "qt_impspath=$QT_INSTALL_IMPORTS", + "qt_adatpath=$QT_INSTALL_ARCHDATA", "qt_datapath=$QT_INSTALL_DATA", "qt_trnspath=$QT_INSTALL_TRANSLATIONS", "qt_xmplpath=$QT_INSTALL_EXAMPLES", @@ -3644,7 +3656,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; fi QMAKE_BIN_DIR="$QT_INSTALL_BINS" [ -z "$QMAKE_BIN_DIR" ] && QMAKE_BIN_DIR="${QT_INSTALL_PREFIX}/bin" - QMAKE_DATA_DIR="$QT_INSTALL_DATA" + QMAKE_DATA_DIR="$QT_INSTALL_ARCHDATA" [ -z "$QMAKE_DATA_DIR" ] && QMAKE_DATA_DIR="${QT_INSTALL_PREFIX}" echo >>"$mkfile" adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'` -- cgit v1.2.3