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/lib/qtprofilesetup | |
| 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/lib/qtprofilesetup')
| -rw-r--r-- | src/lib/qtprofilesetup/use_qtprofilesetup.pri | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/qtprofilesetup/use_qtprofilesetup.pri b/src/lib/qtprofilesetup/use_qtprofilesetup.pri index 9ed5ad033..1cba270e8 100644 --- a/src/lib/qtprofilesetup/use_qtprofilesetup.pri +++ b/src/lib/qtprofilesetup/use_qtprofilesetup.pri @@ -1,7 +1,8 @@ include(../../../qbs_version.pri) +include(../../library_dirname.pri) isEmpty(QBSLIBDIR) { - QBSLIBDIR = $${OUT_PWD}/../../../lib + QBSLIBDIR = $${OUT_PWD}/../../../$${QBS_LIBRARY_DIRNAME} } LIBNAME=qbsqtprofilesetup @@ -11,8 +12,8 @@ unix { } !disable_rpath { - linux-*:QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,\$\$ORIGIN/../lib\' - macx:QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../lib + linux-*:QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,\$\$ORIGIN/../$${QBS_LIBRARY_DIRNAME}\' + macx:QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../$${QBS_LIBRARY_DIRNAME} } !CONFIG(static, static|shared) { |