From b14da5de6bf36badd068bb9d6d7a0d49ea205613 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 17 Apr 2019 14:32:29 +0200 Subject: [PATCH] Properly fix lib install paths --- debian/libnymea-remoteproxy-dev.install.in | 2 +- debian/libnymea-remoteproxy.install.in | 6 +++--- debian/libnymea-remoteproxyclient-dev.install.in | 2 +- debian/libnymea-remoteproxyclient.install.in | 6 +++--- libnymea-remoteproxy/libnymea-remoteproxy.pro | 2 +- libnymea-remoteproxyclient/libnymea-remoteproxyclient.pro | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/debian/libnymea-remoteproxy-dev.install.in b/debian/libnymea-remoteproxy-dev.install.in index 1576c8a..da01e14 100644 --- a/debian/libnymea-remoteproxy-dev.install.in +++ b/debian/libnymea-remoteproxy-dev.install.in @@ -1,2 +1,2 @@ -usr/lib/libnymea-remoteproxy.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/@DEB_HOST_MULTIARCH@/libnymea-remoteproxy.so usr/include/nymea-remoteproxy/* usr/include/nymea-remoteproxy diff --git a/debian/libnymea-remoteproxy.install.in b/debian/libnymea-remoteproxy.install.in index 967b66d..9a0a037 100644 --- a/debian/libnymea-remoteproxy.install.in +++ b/debian/libnymea-remoteproxy.install.in @@ -1,3 +1,3 @@ -usr/lib/libnymea-remoteproxy.so.1 usr/lib/@DEB_HOST_MULTIARCH@/ -usr/lib/libnymea-remoteproxy.so.1.0 usr/lib/@DEB_HOST_MULTIARCH@/ -usr/lib/libnymea-remoteproxy.so.1.0.0 usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/@DEB_HOST_MULTIARCH@/libnymea-remoteproxy.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libnymea-remoteproxy.so.1.0 +usr/lib/@DEB_HOST_MULTIARCH@/libnymea-remoteproxy.so.1.0.0 diff --git a/debian/libnymea-remoteproxyclient-dev.install.in b/debian/libnymea-remoteproxyclient-dev.install.in index e0f4fd0..da4196d 100644 --- a/debian/libnymea-remoteproxyclient-dev.install.in +++ b/debian/libnymea-remoteproxyclient-dev.install.in @@ -1,2 +1,2 @@ -usr/lib/libnymea-remoteproxyclient.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/@DEB_HOST_MULTIARCH@/libnymea-remoteproxyclient.so usr/include/nymea-remoteproxyclient/* usr/include/nymea-remoteproxyclient diff --git a/debian/libnymea-remoteproxyclient.install.in b/debian/libnymea-remoteproxyclient.install.in index 6c6b638..e6deb6a 100644 --- a/debian/libnymea-remoteproxyclient.install.in +++ b/debian/libnymea-remoteproxyclient.install.in @@ -1,3 +1,3 @@ -usr/lib/libnymea-remoteproxyclient.so.1 usr/lib/@DEB_HOST_MULTIARCH@/ -usr/lib/libnymea-remoteproxyclient.so.1.0 usr/lib/@DEB_HOST_MULTIARCH@/ -usr/lib/libnymea-remoteproxyclient.so.1.0.0 usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/@DEB_HOST_MULTIARCH@/libnymea-remoteproxyclient.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libnymea-remoteproxyclient.so.1.0 +usr/lib/@DEB_HOST_MULTIARCH@/libnymea-remoteproxyclient.so.1.0.0 diff --git a/libnymea-remoteproxy/libnymea-remoteproxy.pro b/libnymea-remoteproxy/libnymea-remoteproxy.pro index c81a128..6f4da6e 100644 --- a/libnymea-remoteproxy/libnymea-remoteproxy.pro +++ b/libnymea-remoteproxy/libnymea-remoteproxy.pro @@ -62,5 +62,5 @@ for(header, HEADERS) { eval(INSTALLS *= headers_$${path}) } -target.path = /usr/lib +target.path = $$[QT_INSTALL_LIBS] INSTALLS += target diff --git a/libnymea-remoteproxyclient/libnymea-remoteproxyclient.pro b/libnymea-remoteproxyclient/libnymea-remoteproxyclient.pro index 6b6172c..92455c1 100644 --- a/libnymea-remoteproxyclient/libnymea-remoteproxyclient.pro +++ b/libnymea-remoteproxyclient/libnymea-remoteproxyclient.pro @@ -2,7 +2,7 @@ include(../nymea-remoteproxy.pri) TEMPLATE = lib TARGET = nymea-remoteproxyclient -target.path = /usr/lib/ +target.path = $$[QT_INSTALL_LIBS] include(libnymea-remoteproxyclient.pri)