aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2012-09-03 16:24:46 +0200
committerJeremy Lainé <jeremy.laine@m4x.org>2012-09-03 16:24:46 +0200
commitc12cf726baf79b8c5c69b96adbf6f6a4d6f52127 (patch)
treee7a3f18b24b4cf29a5acbd9075f810331cb27683
parent033eca2d85b1b4192d8bc1efdd316e51e7ead9ac (diff)
downloadqxmpp-c12cf726baf79b8c5c69b96adbf6f6a4d6f52127.tar.gz
restore default PREFIX
-rw-r--r--README4
-rw-r--r--qxmpp.pri8
2 files changed, 10 insertions, 2 deletions
diff --git a/README b/README
index 3e913c26..5dbd8168 100644
--- a/README
+++ b/README
@@ -21,7 +21,9 @@ qmake <arguments>
You can pass the following arguments to qmake:
PREFIX=<prefix> to change the install prefix
- default: $$[QT_INSTALL_PREFIX]
+ default:
+ unix: /usr/local on unix
+ other: $$[QT_INSTALL_PREFIX]
QXMPP_LIBRARY_TYPE=staticlib to build a static version of QXmpp
QXMPP_USE_SPEEX=1 to enable speex audio codec
QXMPP_USE_THEORA=1 to enable theora video codec
diff --git a/qxmpp.pri b/qxmpp.pri
index 3a6bc8a0..827b07e3 100644
--- a/qxmpp.pri
+++ b/qxmpp.pri
@@ -48,7 +48,13 @@ contains(QXMPP_LIBRARY_TYPE,staticlib) {
# Installation prefix and library directory
isEmpty(PREFIX) {
- PREFIX = $$[QT_INSTALL_PREFIX]
+ contains(MEEGO_EDITION,harmattan) {
+ PREFIX = /usr
+ } else:unix {
+ PREFIX = /usr/local
+ } else {
+ PREFIX = $$[QT_INSTALL_PREFIX]
+ }
}
isEmpty(LIBDIR) {
LIBDIR = lib