From a8443321caeedab90f82be99cf9fe388666c32cb Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Mon, 3 Sep 2012 11:11:38 +0200 Subject: use $$[QT_INSTALL_PREFIX] as the default for PREFIX --- README | 1 + qxmpp.pri | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/README b/README index c993cfdf..3e913c26 100644 --- a/README +++ b/README @@ -21,6 +21,7 @@ qmake You can pass the following arguments to qmake: PREFIX= to change the install prefix + default: $$[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 8ef9304d..f2f8906f 100644 --- a/qxmpp.pri +++ b/qxmpp.pri @@ -48,14 +48,10 @@ contains(QXMPP_LIBRARY_TYPE,staticlib) { # Installation prefix and library directory isEmpty(PREFIX) { - contains(MEEGO_EDITION,harmattan) { - PREFIX = /usr - } else:unix { - PREFIX = /usr/local - } + PREFIX = $$[QT_INSTALL_PREFIX] } isEmpty(LIBDIR) { - LIBDIR=lib + LIBDIR = lib } # Internal API auto-tests -- cgit v1.2.3