diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-02-27 15:03:08 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-02-27 15:19:48 +0100 |
| commit | 3e746e4741513dabf60f43efab938d8fc94cd1be (patch) | |
| tree | e32614c2b9963c9f7af21b307d74a711eeecc4ed /src/plugins | |
| parent | 670bb104695ac80252bed4e15da116c324b50937 (diff) | |
Make the "lib" part of plugin and library locations configurable.
Can now be set to e.g. "lib64" if required.
Task-number: QBS-343
Change-Id: I6f34ade37f39400cc5fde63133a464565feb34c1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/plugins.pri | 4 | ||||
| -rw-r--r-- | src/plugins/scanner/scannerplugin.qbs | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri index 46b33d431..a348d52fd 100644 --- a/src/plugins/plugins.pri +++ b/src/plugins/plugins.pri @@ -13,9 +13,11 @@ CONFIG += depend_includepath CONFIG += shared unix: CONFIG += plugin +include(../library_dirname.pri) + !isEmpty(QBS_PLUGINS_INSTALL_DIR): \ installPrefix = $${QBS_PLUGINS_INSTALL_DIR} else: \ - installPrefix = $${QBS_INSTALL_PREFIX}/lib + installPrefix = $${QBS_INSTALL_PREFIX}/$${QBS_LIBRARY_DIRNAME} target.path = $${installPrefix}/qbs/plugins INSTALLS += target diff --git a/src/plugins/scanner/scannerplugin.qbs b/src/plugins/scanner/scannerplugin.qbs index 975c510cc..9428741e8 100644 --- a/src/plugins/scanner/scannerplugin.qbs +++ b/src/plugins/scanner/scannerplugin.qbs @@ -3,7 +3,7 @@ import qbs 1.0 DynamicLibrary { Depends { name: "cpp" } Depends { name: "Qt.core" } - destinationDirectory: "lib/qbs/plugins" + destinationDirectory: project.libDirName + "/qbs/plugins" Group { fileTagsFilter: ["dynamiclibrary"] qbs.install: true |