diff options
author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2012-09-03 18:24:02 +0200 |
---|---|---|
committer | Daniel Molkentin <daniel.molkentin@nokia.com> | 2012-09-05 16:37:42 +0200 |
commit | c29bf6f6525d435d69936576761b4a29102cd056 (patch) | |
tree | 3458e1bb423c568fcbd7799dcac1876a89047470 /src/qtcreatorplugin.pri | |
parent | d1b65bbf837cfd4f8b655f55633afdcfe1ebe1e8 (diff) |
Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT).
Reason: $INSTALL_ROOT is only meant to be used by packagers
to temporarily put the contents into a different location,
which is needed for fakeroot packaging.
QTC_PREFIX is not a qmake variable, and defaults to
/usr/local. On Windows the default prefix is "QtCreator",
since "make install" is expected to be used in
a packaging context only where either INSTALL_ROOT
should be used or QTC_PREFIX should be set to the
absolute destination path where e.g. an installer
generator will pick it up.
Change-Id: Ifa4950340e58e34726c53f5417adcc7b50828ce1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/qtcreatorplugin.pri')
-rw-r--r-- | src/qtcreatorplugin.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri index ea0360753b..292b10ad74 100644 --- a/src/qtcreatorplugin.pri +++ b/src/qtcreatorplugin.pri @@ -99,9 +99,9 @@ CONFIG += plugin plugin_with_soname linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF !macx { - target.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER + target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER pluginspec.files += $${TARGET}.pluginspec - pluginspec.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER + pluginspec.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER INSTALLS += target pluginspec } |