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/library.pri | |
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/library.pri')
-rw-r--r-- | src/lib/library.pri | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/library.pri b/src/lib/library.pri index fbb159ca6..643c90649 100644 --- a/src/lib/library.pri +++ b/src/lib/library.pri @@ -1,9 +1,11 @@ +include(../library_dirname.pri) + TEMPLATE = lib QT = core !isEmpty(QBS_DLLDESTDIR):DLLDESTDIR = $${QBS_DLLDESTDIR} else:DLLDESTDIR = ../../../bin !isEmpty(QBS_DESTDIR):DESTDIR = $${QBS_DESTDIR} -else:DESTDIR = ../../../lib +else:DESTDIR = ../../../$${QBS_LIBRARY_DIRNAME} CONFIG(static, static|shared) { DEFINES += QBS_STATIC_LIB } else { @@ -22,11 +24,11 @@ win32 { dlltarget.path = $${QBS_INSTALL_PREFIX}/bin INSTALLS += dlltarget } + !win32|!qbs_no_dev_install { !isEmpty(QBS_LIB_INSTALL_DIR): \ target.path = $${QBS_LIB_INSTALL_DIR} else: \ - target.path = $${QBS_INSTALL_PREFIX}/lib + target.path = $${QBS_INSTALL_PREFIX}/$${QBS_LIBRARY_DIRNAME} INSTALLS += target } - |