From 15a64cec8b3ca7111fa631861fce8227a9a3dda8 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Thu, 30 Apr 2015 04:05:54 -0700 Subject: qmake: fix DESTDIR of qbs plugin shared libraries. Change-Id: Ib8941b0d9232155545792215803556be5a5d4d17 Reviewed-by: Christian Kandeler --- src/plugins/plugins.pri | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri index 3775c60..70bc0e0 100644 --- a/src/plugins/plugins.pri +++ b/src/plugins/plugins.pri @@ -1,7 +1,9 @@ +include(../library_dirname.pri) + !isEmpty(QBS_PLUGINS_BUILD_DIR) { destdirPrefix = $${QBS_PLUGINS_BUILD_DIR} } else { - destdirPrefix = $$shadowed($$PWD)/../../lib + destdirPrefix = $$shadowed($$PWD)/../../$${QBS_LIBRARY_DIRNAME} } DESTDIR = $${destdirPrefix}/qbs/plugins TEMPLATE = lib @@ -10,8 +12,6 @@ CONFIG += depend_includepath CONFIG += shared unix: CONFIG += plugin -include(../library_dirname.pri) - !isEmpty(QBS_PLUGINS_INSTALL_DIR): \ installPrefix = $${QBS_PLUGINS_INSTALL_DIR} else: \ -- 2.4.0