summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2014-12-01 20:06:52 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-02-05 14:26:31 +0000
commita07fd165f34167c2b2e1cc4ea03ba8b82ebedc34 (patch)
tree6cfd4cdb1f568c3a5dda68535b13221bc0f6fccc
parentc0fa5922b2decccb9358202ad603ba2457abb05f (diff)
configure --help clarifications relating to -*prefix
Change-Id: I71c78b7c91c9fedb7d55731b3f61d46ea75c9b8d Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
-rwxr-xr-xconfigure13
-rw-r--r--tools/configure/configureapp.cpp11
2 files changed, 13 insertions, 11 deletions
diff --git a/configure b/configure
index 33ac6b5f89..041d92eaf8 100755
--- a/configure
+++ b/configure
@@ -2254,16 +2254,15 @@ Installation options:
These are optional, but you may specify install directories.
- -prefix <dir> ...... This will install everything relative to <dir>
+ -prefix <dir> ...... The deployment directory, as seen on the target device.
(default /usr/local/Qt-${QT_VERSION}, \$PWD if -developer-build is active)
- -extprefix <dir> ... When -sysroot is used, install everything to <dir>,
- rather than into SYSROOT/PREFIX.
+ -extprefix <dir> ... The installation directory, as seen on the host machine.
+ (default SYSROOT/PREFIX)
- -hostprefix [dir] .. Tools and libraries needed when developing
- applications are installed in [dir]. If [dir] is
- not given, the current build directory will be used.
- (default EXTPREFIX)
+ -hostprefix [dir] .. The installation directory for build tools running on the
+ host machine. If [dir] is not given, the current build
+ directory will be used. (default EXTPREFIX)
You may use these to separate different parts of the install:
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index adab4b7a9a..a1d0699786 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1717,12 +1717,15 @@ bool Configure::displayHelp()
desc("These are optional, but you may specify install directories.\n\n", 0, 1);
- desc( "-prefix <dir>", "This will install everything relative to <dir> (default $QT_INSTALL_PREFIX)\n");
+ desc( "-prefix <dir>", "The deployment directory, as seen on the target device.\n"
+ "(default %CD%)\n");
- desc( "-extprefix <dir>", "When -sysroot is used, install everything to <dir>, rather than into SYSROOT/PREFIX.\n");
+ desc( "-extprefix <dir>", "The installation directory, as seen on the host machine.\n"
+ "(default SYSROOT/PREFIX)\n");
- desc( "-hostprefix [dir]", "Tools and libraries needed when developing applications are installed in [dir]. "
- "If [dir] is not given, the current build directory will be used. (default EXTPREFIX)\n");
+ desc( "-hostprefix [dir]", "The installation directory for build tools running on the\n"
+ "host machine. If [dir] is not given, the current build\n"
+ "directory will be used. (default EXTPREFIX)\n");
desc("You may use these to separate different parts of the install:\n\n");