1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
|
From: Fathi Boudra <fabo@debian.org>
Date: Sun, 11 Dec 2022 10:40:34 +0000
Subject: adjust QWT install paths
---
qwtconfig.pri | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
--- a/qwtconfig.pri
+++ b/qwtconfig.pri
@@ -19,8 +19,7 @@
QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
unix {
- QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION
- # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION
+ QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
}
win32 {
@@ -28,8 +27,8 @@
# QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION
}
-QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc
-QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include
+QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/share/doc/libqwt-doc
+QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include/qwt
QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib
######################################################################
@@ -42,7 +41,7 @@
# runtime environment of designer/creator.
######################################################################
-QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer
+QWT_INSTALL_PLUGINS = $$[QT_INSTALL_PLUGINS]/designer
# linux distributors often organize the Qt installation
# their way and QT_INSTALL_PREFIX doesn't offer a good
@@ -63,7 +62,7 @@
# with every Qt upgrade.
######################################################################
-QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features
+QWT_INSTALL_FEATURES = $$[QMAKE_MKSPECS]/features
# QWT_INSTALL_FEATURES = $$[QT_INSTALL_PREFIX]/features
######################################################################
|