diff options
| -rw-r--r-- | qbs.qbs | 2 | ||||
| -rw-r--r-- | src/app/qbs/qbs.pro | 2 | ||||
| -rw-r--r-- | src/libexec/libexec.pri | 6 | ||||
| -rw-r--r-- | tests/auto/api/api.pro | 2 |
4 files changed, 7 insertions, 5 deletions
@@ -12,7 +12,7 @@ Project { property string libDirName: "lib" property string appInstallDir: "bin" property string libInstallDir: qbs.targetOS.contains("windows") ? "bin" : libDirName - property string libexecInstallDir: "libexec" + property string libexecInstallDir: "libexec/qbs" property string relativeLibexecPath: "../" + libexecInstallDir property string relativePluginsPath: "../" + libDirName property string relativeSearchPath: ".." diff --git a/src/app/qbs/qbs.pro b/src/app/qbs/qbs.pro index 783dabd6d..f2c3023b6 100644 --- a/src/app/qbs/qbs.pro +++ b/src/app/qbs/qbs.pro @@ -20,7 +20,7 @@ HEADERS += \ qbstool.h include(../../library_dirname.pri) -isEmpty(QBS_RELATIVE_LIBEXEC_PATH):QBS_RELATIVE_LIBEXEC_PATH=../libexec +isEmpty(QBS_RELATIVE_LIBEXEC_PATH):QBS_RELATIVE_LIBEXEC_PATH=../libexec/qbs isEmpty(QBS_RELATIVE_PLUGINS_PATH):QBS_RELATIVE_PLUGINS_PATH=../$${QBS_LIBRARY_DIRNAME} isEmpty(QBS_RELATIVE_SEARCH_PATH):QBS_RELATIVE_SEARCH_PATH=.. DEFINES += QBS_RELATIVE_LIBEXEC_PATH=\\\"$${QBS_RELATIVE_LIBEXEC_PATH}\\\" diff --git a/src/libexec/libexec.pri b/src/libexec/libexec.pri index 439f30f1f..5eeb7b9db 100644 --- a/src/libexec/libexec.pri +++ b/src/libexec/libexec.pri @@ -1,6 +1,8 @@ +include(../install_prefix.pri) + !isEmpty(QBS_LIBEXEC_DESTDIR):DESTDIR=$${QBS_LIBEXEC_DESTDIR} -else:DESTDIR = ../../../libexec +else:DESTDIR = ../../../libexec/qbs !isEmpty(QBS_LIBEXEC_INSTALL_DIR):target.path = $${QBS_LIBEXEC_INSTALL_DIR} -else:target.path = $${QBS_INSTALL_PREFIX}/libexec +else:target.path = $${QBS_INSTALL_PREFIX}/libexec/qbs INSTALLS += target diff --git a/tests/auto/api/api.pro b/tests/auto/api/api.pro index 8db2f7598..4ecfb9d4b 100644 --- a/tests/auto/api/api.pro +++ b/tests/auto/api/api.pro @@ -4,7 +4,7 @@ HEADERS = tst_api.h SOURCES = tst_api.cpp include(../../../src/library_dirname.pri) -isEmpty(QBS_RELATIVE_LIBEXEC_PATH):QBS_RELATIVE_LIBEXEC_PATH=../libexec +isEmpty(QBS_RELATIVE_LIBEXEC_PATH):QBS_RELATIVE_LIBEXEC_PATH=../libexec/qbs isEmpty(QBS_RELATIVE_PLUGINS_PATH):QBS_RELATIVE_PLUGINS_PATH=../$${QBS_LIBRARY_DIRNAME} isEmpty(QBS_RELATIVE_SEARCH_PATH):QBS_RELATIVE_SEARCH_PATH=.. DEFINES += QBS_RELATIVE_LIBEXEC_PATH=\\\"$${QBS_RELATIVE_LIBEXEC_PATH}\\\" |