You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
50 lines
1.5 KiB
50 lines
1.5 KiB
14 years ago
|
diff -up qwt-5.2.1/qwtconfig.pri.install_qt qwt-5.2.1/qwtconfig.pri
|
||
|
|
--- qwt-5.2.1/qwtconfig.pri.install_qt 2010-04-11 04:55:06.000000000 -0500
|
||
|
|
+++ qwt-5.2.1/qwtconfig.pri 2011-07-14 08:22:26.207212795 -0500
|
||
|
|
@@ -7,6 +7,11 @@ VER_MIN = 2
|
||
|
|
VER_PAT = 1
|
||
|
|
VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
|
||
|
|
|
||
|
|
+CONFIG(install-qt) {
|
||
|
|
+target.path = $$[QT_INSTALL_LIBS]
|
||
|
|
+headers.path = $$[QT_INSTALL_HEADERS]/qwt
|
||
|
|
+doc.path = $$[QT_INSTALL_DOCS]
|
||
|
|
+} else {
|
||
|
|
unix {
|
||
|
|
INSTALLBASE = /usr/local/qwt-5.2.1
|
||
|
|
}
|
||
|
|
@@ -18,6 +23,7 @@ win32 {
|
||
|
|
target.path = $$INSTALLBASE/lib
|
||
|
|
headers.path = $$INSTALLBASE/include
|
||
|
|
doc.path = $$INSTALLBASE/doc
|
||
|
|
+}
|
||
|
|
|
||
|
|
######################################################################
|
||
|
|
# qmake internal options
|
||
|
|
diff -up qwt-5.2.1/src/src.pro.install_qt qwt-5.2.1/src/src.pro
|
||
|
|
--- qwt-5.2.1/src/src.pro.install_qt 2010-04-11 04:55:06.000000000 -0500
|
||
|
|
+++ qwt-5.2.1/src/src.pro 2011-07-14 08:30:39.759190828 -0500
|
||
|
|
@@ -220,9 +220,17 @@ contains(CONFIG, QwtWidgets) {
|
||
|
|
# Install directives
|
||
|
|
|
||
|
|
headers.files = $$HEADERS
|
||
|
|
-doc.files = $${QWT_ROOT}/doc/html $${QWT_ROOT}/doc/qwt-5.2.0.qch
|
||
|
|
-unix {
|
||
|
|
- doc.files += $${QWT_ROOT}/doc/man
|
||
|
|
-}
|
||
|
|
+INSTALLS += target headers
|
||
|
|
+
|
||
|
|
+html.files = $${QWT_ROOT}/doc/html
|
||
|
|
+html.path = $$[QT_INSTALL_DOCS]/html/
|
||
|
|
+INSTALLS += html
|
||
|
|
+
|
||
|
|
+qch.files = $${QWT_ROOT}/doc/qwt-5.2.0.qch
|
||
|
|
+qch.path = $$[QT_INSTALL_DOCS]/qch
|
||
|
|
+INSTALLS += qch
|
||
|
|
+
|
||
|
|
+unix:man.files += $${QWT_ROOT}/doc/man
|
||
|
|
+unix:man.path = /usr/share
|
||
|
|
+unix:INSTALLS += man
|
||
|
|
|
||
|
|
-INSTALLS = target headers doc
|