summaryrefslogtreecommitdiff
path: root/sowatchd
diff options
context:
space:
mode:
authorJavier S. Pedro <maemo@javispedro.com>2012-01-02 23:38:29 +0100
committerJavier S. Pedro <maemo@javispedro.com>2012-01-02 23:38:29 +0100
commit3f95bcc5150d98f38ff5317589016a46fbb505ef (patch)
treef973b7bc688aa750ebd0e06196f0d31265dceaf6 /sowatchd
parent2b9f2a05435b406e22a0d680b00c81dcf1a34859 (diff)
downloadsowatch-3f95bcc5150d98f38ff5317589016a46fbb505ef.tar.gz
sowatch-3f95bcc5150d98f38ff5317589016a46fbb505ef.zip
Removing QtCreator <2.4 .pro file workarounds
Diffstat (limited to 'sowatchd')
-rw-r--r--sowatchd/sowatchd.pro15
1 files changed, 9 insertions, 6 deletions
diff --git a/sowatchd/sowatchd.pro b/sowatchd/sowatchd.pro
index 1ffe3e3..5c195c6 100644
--- a/sowatchd/sowatchd.pro
+++ b/sowatchd/sowatchd.pro
@@ -25,18 +25,21 @@ else:unix: LIBS += -L$$OUT_PWD/../libsowatch/ -lsowatch
INCLUDEPATH += $$PWD/../libsowatch
DEPENDPATH += $$PWD/../libsowatch
+xml.files = service.xml
+INSTALLS += xml
+
unix {
!isEmpty(MEEGO_VERSION_MAJOR)|maemo5 {
QMAKE_RPATHDIR += /opt/sowatch/lib
target.path = /opt/sowatch/bin
+ xml.path = /opt/sowatch/xml
} else {
target.path = /usr/bin
+ xml.path = /usr/share/sowatch/xml
}
INSTALLS += target
-}
-xml.path = /opt/sowatch/xml
-xml.files = service.xml
-dbus.path = /usr/share/dbus-1/services
-dbus.files = com.javispedro.sowatch.service.sowatch-service.service
-INSTALLS += xml dbus
+ dbus.path = /usr/share/dbus-1/services
+ dbus.files = com.javispedro.sowatch.service.sowatch-service.service
+ INSTALLS += dbus
+}