summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorgregory guy <g-gregory@gmx.fr>2019-05-29 14:25:32 +0200
committerSlávek Banko <slavek.banko@axis.cz>2019-06-01 16:42:32 +0200
commit7c13f5df2fbd64512a99b66f633abb0fd7f87d35 (patch)
treed45c98a3ff18018103f9312949afdc27ec10f040 /configure
parent09f45583d97c73e309a93447707b0acebfbddea8 (diff)
downloadqt3-7c13f5df2fbd64512a99b66f633abb0fd7f87d35.tar.gz
qt3-7c13f5df2fbd64512a99b66f633abb0fd7f87d35.zip
This fixes bug: 639
Add desktop files for: - assistant-qt3 - designer-qt3 - linguist-qt3 - qtconfig-qt3 These files have been made with the contribution of Laurent Dard's patch (see bugzilla:639) with little change/addition from I. Add 'sysshare' option to the configure script. Signed-off-by: gregory guy <g-gregory@gmx.fr> Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure16
1 files changed, 13 insertions, 3 deletions
diff --git a/configure b/configure
index 77accf6..b969f4d 100755
--- a/configure
+++ b/configure
@@ -171,7 +171,7 @@ QT_INSTALL_PLUGINS=
QT_INSTALL_DATA=
QT_INSTALL_TRANSLATIONS=
QT_INSTALL_SYSCONF=
-
+QT_INSTALL_SHARE=
#-------------------------------------------------------------------------------
# check SQL drivers and styles available in this package
@@ -241,7 +241,7 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_ARG=yes
fi
;;
- -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey)
+ -prefix|-sysshare|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey)
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
shift
VAL=$1
@@ -371,6 +371,9 @@ while [ "$#" -gt 0 ]; do
sysconfdir)
QT_INSTALL_SYSCONF="$VAL"
;;
+ sysshare)
+ QT_INSTALL_SHARE="$VAL"
+ ;;
qconfig)
CFG_QCONFIG="$VAL"
;;
@@ -940,6 +943,8 @@ done
[ -z "$QT_INSTALL_TRANSLATIONS" ] && QT_INSTALL_TRANSLATIONS=$QT_INSTALL_PREFIX/translations
# default PREFIX/etc/settings
[ -z "$QT_INSTALL_SYSCONF" ] && QT_INSTALL_SYSCONF=$QT_INSTALL_PREFIX/etc/settings
+# default PREFIX/share
+[ -z "$QT_INSTALL_SHARE" ] && QT_INSTALL_SHARE=$QT_INSTALL_PREFIX/share
# generate qconfig.cpp
[ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools
@@ -956,6 +961,7 @@ static const char QT_INSTALL_PLUGINS [267] = "qt_plgpath=$QT_INSTALL_PLUGINS
static const char QT_INSTALL_DATA [267] = "qt_datpath=$QT_INSTALL_DATA";
static const char QT_INSTALL_TRANSLATIONS[267] = "qt_trnpath=$QT_INSTALL_TRANSLATIONS";
static const char QT_INSTALL_SYSCONF [267] = "qt_cnfpath=$QT_INSTALL_SYSCONF";
+static const char QT_INSTALL_SHARE [267] = "qt_shapath=$QT_INSTALL_SHARE";
/* strlen( "qt_xxxpath=" ) == 11 */
const char *qInstallPath() { return QT_INSTALL_PREFIX + 11; }
@@ -967,6 +973,7 @@ const char *qInstallPathPlugins() { return QT_INSTALL_PLUGINS + 11; }
const char *qInstallPathData() { return QT_INSTALL_DATA + 11; }
const char *qInstallPathTranslations() { return QT_INSTALL_TRANSLATIONS + 11; }
const char *qInstallPathSysconf() { return QT_INSTALL_SYSCONF + 11; }
+const char *qInstallPathShare() { return QT_INSTALL_SHARE + 11; }
EOF
# avoid unecessary rebuilds by copying only if qconfig.cpp has changed
@@ -1851,7 +1858,7 @@ if [ "$OPT_HELP" = "yes" ]; then
cat <<EOF
Usage: $relconf [-prefix dir] [-buildkey key] [-docdir dir] [-headerdir dir]
- [-libdir dir] [-bindir dir] [-plugindir dir ] [-datadir dir]
+ [-libdir dir] [-bindir dir] [-plugindir dir ] [-datadir dir] [-sysshare dir]
[-translationdir dir] [-sysconfdir dir] [-debug] [-release]
[-no-gif] [-qt-gif] [-no-sm] [-sm] [-qt-zlib] [-system-zlib]
[-qt-libpng] [-system-libpng]
@@ -1886,6 +1893,8 @@ Installation options:
(default PREFIX/translations)
-sysconfdir dir ... Settings used by Qt programs will be looked for in dir
(default PREFIX/etc/settings)
+ -sysshare dir ..... System shared data will be installed in dir
+ (default PREFIX/share)
You may use these options to turn on strict plugin loading.
@@ -2752,6 +2761,7 @@ QMAKE_VARS="$QMAKE_VARS \"libs.path=${QT_INSTALL_LIBS}\""
QMAKE_VARS="$QMAKE_VARS \"bins.path=${QT_INSTALL_BINS}\""
QMAKE_VARS="$QMAKE_VARS \"data.path=${QT_INSTALL_DATA}\""
QMAKE_VARS="$QMAKE_VARS \"translations.path=${QT_INSTALL_TRANSLATIONS}\""
+QMAKE_VARS="$QMAKE_VARS \"share.path=${QT_INSTALL_SHARE}\""
# turn off exceptions for the compilers that support it
COMPILER=`echo $PLATFORM | cut -f 2- -d-`