aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2012-02-08 09:49:42 +0000
committerJeremy Lainé <jeremy.laine@m4x.org>2012-02-08 09:49:42 +0000
commitef04d5e30083234d5709cc8371adea690bbbf528 (patch)
treee46b287e173f069576d7a793cf548db9d250c8c6
parent338a29bab47d690c7a847473316066444f8b788c (diff)
downloadqxmpp-ef04d5e30083234d5709cc8371adea690bbbf528.tar.gz
don't make install prefix depend on qt's installation prefix
-rw-r--r--qxmpp.pri4
-rw-r--r--qxmpp.pro2
-rw-r--r--src/src.pro4
3 files changed, 7 insertions, 3 deletions
diff --git a/qxmpp.pri b/qxmpp.pri
index feb433b8..4879312d 100644
--- a/qxmpp.pri
+++ b/qxmpp.pri
@@ -37,3 +37,7 @@ symbian {
QXMPP_LIBRARY_FILE = $${QXMPP_LIBRARY_DIR}/lib$${QXMPP_LIBRARY_NAME}.a
}
+# Installation prefix
+isEmpty(PREFIX) {
+ unix:PREFIX=/usr/local
+}
diff --git a/qxmpp.pro b/qxmpp.pro
index ead33bf5..71522af3 100644
--- a/qxmpp.pro
+++ b/qxmpp.pro
@@ -24,7 +24,7 @@ dist.depends = docs
# Install rules
htmldocs.files = doc/html
-htmldocs.path = $$[QT_INSTALL_PREFIX]/share/doc/qxmpp
+htmldocs.path = $$PREFIX/share/doc/qxmpp
htmldocs.CONFIG += no_check_exist directory
QMAKE_EXTRA_TARGETS += dist docs
diff --git a/src/src.pro b/src/src.pro
index db9d21c0..f163d288 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -181,8 +181,8 @@ SOURCES += \
# Installation
headers.files = $$INSTALL_HEADERS
-headers.path = $$[QT_INSTALL_PREFIX]/include/qxmpp
-target.path = $$[QT_INSTALL_LIBS]
+headers.path = $$PREFIX/include/qxmpp
+target.path = $$PREFIX/lib
INSTALLS += headers target
# pkg-config support