Properly fix install paths

pull/153/head
Michael Zanetti 2019-04-17 15:08:53 +02:00
parent ad4c2acbfc
commit 3ff10e2881
7 changed files with 12 additions and 7 deletions

View File

@ -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/

View File

@ -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

View File

@ -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

View File

@ -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/

View File

@ -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

View File

@ -8,7 +8,7 @@ DEFINES += LIBNYMEA_LIBRARY
QMAKE_LFLAGS += -fPIC
target.path = /usr/lib/
target.path = $$[QT_INSTALL_LIBS]
INSTALLS += target
# Avahi libs

View File

@ -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