summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-11-06 22:10:37 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-04 17:35:21 +0100
commitfc032aa713d772f2be385b746f3f15c4d9334c9d (patch)
tree4a7eb539ccba97360409d2e10e95d2cb3e9aff60
parenta094bf5a893c3cccffff10c1420bfbe3a3c02a7c (diff)
Update the sysconfdir default to non-absolute
Make the settings path to be relative to $prefix, instead of absolute. And update the configure -help output to match the actual code. Change-Id: I71e4ad6e3db046fec95ef057ae7f7bc566bc5794 Reviewed-by: Sune Vuorela <sune@vuorela.dk> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index faf8a6d380..89246c8d7c 100755
--- a/configure
+++ b/configure
@@ -2844,7 +2844,7 @@ if [ -z "$QT_INSTALL_SETTINGS" ]; then #default
if [ "$BUILD_ON_MAC" = "yes" ]; then
QT_INSTALL_SETTINGS=/Library/Preferences/Qt
else
- QT_INSTALL_SETTINGS=/etc/xdg
+ QT_INSTALL_SETTINGS=$QT_INSTALL_PREFIX/etc/xdg
fi
fi
QT_INSTALL_SETTINGS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_SETTINGS"`
@@ -3044,7 +3044,7 @@ Installation options:
-translationdir <dir> . Translations of Qt programs will be installed to <dir>
(default DATADIR/translations)
-sysconfdir <dir> ..... Settings used by Qt programs will be looked for in <dir>
- (default PREFIX/etc/settings)
+ (default PREFIX/etc/xdg)
-examplesdir <dir> .... Examples will be installed to <dir>
(default PREFIX/examples)
-testsdir <dir> ....... Tests will be installed to <dir>