From 3ff10e288115c37e62b7ec72a2276844f09052ea Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 17 Apr 2019 15:08:53 +0200 Subject: [PATCH] Properly fix install paths --- debian/libnymea1-dev.install.in | 3 ++- debian/libnymea1.install.in | 4 +++- debian/nymea-tests.install.in | 2 +- debian/nymead.install.in | 4 +++- libnymea-core/libnymea-core.pro | 2 +- libnymea/libnymea.pro | 2 +- plugins/plugins.pri | 2 +- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/debian/libnymea1-dev.install.in b/debian/libnymea1-dev.install.in index 5b94457f..2038eeef 100644 --- a/debian/libnymea1-dev.install.in +++ b/debian/libnymea1-dev.install.in @@ -1,4 +1,5 @@ -usr/lib/libnymea*.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/@DEB_HOST_MULTIARCH@/libnymea.so +usr/lib/@DEB_HOST_MULTIARCH@/libnymea-core.so usr/include/nymea/* usr/include/nymea usr/bin/nymea-generateplugininfo usr/bin libnymea/plugin/plugin.pri usr/include/nymea/ diff --git a/debian/libnymea1.install.in b/debian/libnymea1.install.in index 9211e1dd..bc80c121 100644 --- a/debian/libnymea1.install.in +++ b/debian/libnymea1.install.in @@ -1 +1,3 @@ -usr/lib/libnymea.so.* usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/@DEB_HOST_MULTIARCH@/libnymea.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libnymea.so.1.0 +usr/lib/@DEB_HOST_MULTIARCH@/libnymea.so.1.0.0 diff --git a/debian/nymea-tests.install.in b/debian/nymea-tests.install.in index 054cd231..7b9977c6 100644 --- a/debian/nymea-tests.install.in +++ b/debian/nymea-tests.install.in @@ -1,2 +1,2 @@ usr/tests/* usr/lib/@DEB_HOST_MULTIARCH@/nymea/tests -usr/lib/nymea/plugins/libnymea_devicepluginmock.so usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_devicepluginmock.so +usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_devicepluginmock.so diff --git a/debian/nymead.install.in b/debian/nymead.install.in index 58218375..672a4bd3 100644 --- a/debian/nymead.install.in +++ b/debian/nymead.install.in @@ -1,5 +1,7 @@ usr/bin/nymead -usr/lib/libnymea-core.so.* usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/@DEB_HOST_MULTIARCH@/libnymea-core.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libnymea-core.so.1.0 +usr/lib/@DEB_HOST_MULTIARCH@/libnymea-core.so.1.0.0 data/systemd/nymead.service /lib/systemd/system/ data/logrotate/nymead /etc/logrotate.d/ data/dbus-1/io.guh.nymead.conf /etc/dbus-1/system.d/ diff --git a/libnymea-core/libnymea-core.pro b/libnymea-core/libnymea-core.pro index f8d4c3a3..b7a4adf1 100644 --- a/libnymea-core/libnymea-core.pro +++ b/libnymea-core/libnymea-core.pro @@ -7,7 +7,7 @@ QT += sql INCLUDEPATH += $$top_srcdir/libnymea LIBS += -L$$top_builddir/libnymea/ -lnymea -lssl -lcrypto -lavahi-common -lavahi-client -lnymea-mqtt -target.path = /usr/lib/ +target.path = $$[QT_INSTALL_LIBS] INSTALLS += target # icons for the webserver diff --git a/libnymea/libnymea.pro b/libnymea/libnymea.pro index b7b0ac9b..d4f9fbda 100644 --- a/libnymea/libnymea.pro +++ b/libnymea/libnymea.pro @@ -8,7 +8,7 @@ DEFINES += LIBNYMEA_LIBRARY QMAKE_LFLAGS += -fPIC -target.path = /usr/lib/ +target.path = $$[QT_INSTALL_LIBS] INSTALLS += target # Avahi libs diff --git a/plugins/plugins.pri b/plugins/plugins.pri index 3b83e3c6..fd6d752f 100644 --- a/plugins/plugins.pri +++ b/plugins/plugins.pri @@ -34,5 +34,5 @@ PRE_TARGETDEPS += compiler_plugininfo_make_all compiler_externplugininfo_make_al QMAKE_EXTRA_COMPILERS += plugininfo externplugininfo # Install plugin -target.path = /usr/lib/nymea/plugins/ +target.path = $$[QT_INSTALL_LIBS]/nymea/plugins/ INSTALLS += target