Merge PR #162: Fix include installs

debian/libnymea1-dev.install.in

@@ -2,4 +2,4 @@ usr/lib/@DEB_HOST_MULTIARCH@/libnymea.so
 usr/include/nymea/* usr/include/nymea
 usr/bin/nymea-generateplugininfo usr/bin
 libnymea/plugin/plugin.pri usr/include/nymea/
-usr/lib/@DEB_HOST_MULTIARCH@/nymea.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/
+usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/nymea.pc

libnymea/libnymea.pro

@@ -129,14 +129,18 @@ RESOURCES += \
 ## Install instructions
 
 # install plugininfo python script for libnymea-dev
-generateplugininfo.files = $$top_srcdir/plugins/nymea-generateplugininfo
-generateplugininfo.path = /usr/bin
+generateplugininfo.files = plugin/nymea-generateplugininfo
+generateplugininfo.path = $$[QT_INSTALL_PREFIX]/bin
+INSTALLS += generateplugininfo
 
-INSTALLS +=  generateplugininfo
+# install plugin.pri for external plugins
+pluginpri.files = plugin/plugin.pri
+pluginpri.path = $$[QT_INSTALL_PREFIX]/include/nymea/
+INSTALLS += pluginpri
 
 # install header file with relative subdirectory
 for(header, HEADERS) {
-    path = $${PREFIX}/include/nymea/$${dirname(header)}
+    path = $$[QT_INSTALL_PREFIX]/include/nymea/$${dirname(header)}
     eval(headers_$${path}.files += $${header})
     eval(headers_$${path}.path = $${path})
     eval(INSTALLS *= headers_$${path})
@@ -150,7 +154,10 @@ INSTALLS += target
 CONFIG += create_pc create_prl no_install_prl
 QMAKE_PKGCONFIG_NAME = libnymea
 QMAKE_PKGCONFIG_DESCRIPTION = nymea development library
-QMAKE_PKGCONFIG_PREFIX = $${PREFIX}
+QMAKE_PKGCONFIG_PREFIX = $$[QT_INSTALL_PREFIX]
+QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_PREFIX]/include/nymea/
 QMAKE_PKGCONFIG_LIBDIR = $$target.path
-QMAKE_PKGCONFIG_INCDIR = /usr/include/nymea
 QMAKE_PKGCONFIG_VERSION = $$NYMEA_VERSION_STRING
+QMAKE_PKGCONFIG_FILE = nymea
+QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+

libnymea/plugin/plugin.pri

@@ -27,12 +27,9 @@
 
 
 TEMPLATE = lib
-CONFIG += plugin
+CONFIG += plugin link_pkgconfig
 
-INCLUDEPATH += /usr/include/nymea
-LIBS += -lnymea
-
-PLUGIN_PATH=/usr/lib/$$system('dpkg-architecture -q DEB_HOST_MULTIARCH')/nymea/plugins/
+PKGCONFIG += nymea
 
 QMAKE_CXXFLAGS *= -Werror -std=c++11 -g
 QMAKE_LFLAGS *= -std=c++11
@@ -84,5 +81,5 @@ HEADERS += $$OUT_PWD/plugininfo.h \
 DEPENDPATH += $$OUT_PWD
 
 # Install plugin
-target.path = $$PLUGIN_PATH
+target.path = $$[QT_INSTALL_LIBS]/nymea/plugins/
 INSTALLS += target translations

plugins/plugins.pri

@@ -14,7 +14,7 @@ JSONFILE=$$PWD/$$TARGET/deviceplugin"$$TARGET".json
 plugininfo.input = JSONFILE
 plugininfo.output = plugininfo.h
 plugininfo.CONFIG = no_link target_predeps
-plugininfo.commands = $$top_srcdir/plugins/nymea-generateplugininfo \
+plugininfo.commands = $$top_srcdir/libnymea/plugin/nymea-generateplugininfo \
                             --filetype i \
                             --jsonfile $$PWD/$$TARGET/deviceplugin"$$TARGET".json \
                             --output plugininfo.h \