From 4e32a9b273d2bd9ef6a8edc8888ef0676bfd2e26 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 17 Apr 2019 13:52:49 +0200 Subject: [PATCH] PRoperly fix the install path by querying qmake --- debian/libnymea-mqtt-dev.install.in | 2 +- debian/libnymea-mqtt.install.in | 6 +++--- libnymea-mqtt/libnymea-mqtt.pri | 2 +- libnymea-mqtt/libnymea-mqtt.pro | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/libnymea-mqtt-dev.install.in b/debian/libnymea-mqtt-dev.install.in index 35c1510..20dd332 100644 --- a/debian/libnymea-mqtt-dev.install.in +++ b/debian/libnymea-mqtt-dev.install.in @@ -1,2 +1,2 @@ -usr/lib/libnymea-mqtt.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/@DEB_HOST_MULTIARCH@/libnymea-mqtt.so usr/include/nymea-mqtt/ diff --git a/debian/libnymea-mqtt.install.in b/debian/libnymea-mqtt.install.in index 68e5bdd..ab85e26 100644 --- a/debian/libnymea-mqtt.install.in +++ b/debian/libnymea-mqtt.install.in @@ -1,3 +1,3 @@ -usr/lib/libnymea-mqtt.so.1 usr/lib/@DEB_HOST_MULTIARCH@/ -usr/lib/libnymea-mqtt.so.1.0 usr/lib/@DEB_HOST_MULTIARCH@/ -usr/lib/libnymea-mqtt.so.1.0.0 usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/@DEB_HOST_MULTIARCH@/libnymea-mqtt.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libnymea-mqtt.so.1.0 +usr/lib/@DEB_HOST_MULTIARCH@/libnymea-mqtt.so.1.0.0 diff --git a/libnymea-mqtt/libnymea-mqtt.pri b/libnymea-mqtt/libnymea-mqtt.pri index fefd70e..568d603 100644 --- a/libnymea-mqtt/libnymea-mqtt.pri +++ b/libnymea-mqtt/libnymea-mqtt.pri @@ -25,4 +25,4 @@ PUBLIC_HEADERS = \ mqttsubscription.h \ mqttclient.h \ -HEADERS += $$PRIVATE_HEADERS + $$PUBLIC_HEADERS +HEADERS += $$PRIVATE_HEADERS $$PUBLIC_HEADERS diff --git a/libnymea-mqtt/libnymea-mqtt.pro b/libnymea-mqtt/libnymea-mqtt.pro index bce50dc..5bc629c 100644 --- a/libnymea-mqtt/libnymea-mqtt.pro +++ b/libnymea-mqtt/libnymea-mqtt.pro @@ -9,8 +9,8 @@ CONFIG -= static CONFIG += shared # install lib -target.path = /usr/lib -INSTALLS += target +target.path = $$[QT_INSTALL_LIBS] +INSTALLS += target # install headers pubheaders.files += $$PUBLIC_HEADERS