aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2019-06-23 03:32:36 +0200
committerDavide Pesavento <davidepesa@gmail.com>2019-06-25 15:20:41 +0000
commit636ee64eea7461e09070b34ec80ee193dd46767f (patch)
tree943ef13541d7fe907184040db4eba6ad47f3c897
parent7fbf8f5edc4c582418988828d5574222e9fd8c91 (diff)
Use QBS_LIBRARY_DIRNAME instead of hardcoding "lib"
Change-Id: If98125a9c8f95d3270ced4b8d0d11d1e7ca91060 Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--static-res.pro3
1 files changed, 2 insertions, 1 deletions
diff --git a/static-res.pro b/static-res.pro
index 86816bbf0..cbf9aa9d2 100644
--- a/static-res.pro
+++ b/static-res.pro
@@ -5,8 +5,9 @@ else: qbsbindir = bin
envSpec =
unix:qbs_disable_rpath {
+ include(src/library_dirname.pri)
!isEmpty(QBS_DESTDIR): qbslibdir = $$QBS_DESTDIR
- else: qbslibdir = $$OUT_PWD/lib
+ else: qbslibdir = $$OUT_PWD/$$QBS_LIBRARY_DIRNAME
macos: envVar = DYLD_LIBRARY_PATH
else: envVar = LD_LIBRARY_PATH
oldVal = $$getenv($$envVar)