From 8098c1de96fbd3e39d07946f02ff6c5386d9a5aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Mon, 16 Sep 2019 16:36:18 +0200 Subject: [PATCH] Update pkgconfig and include dir path --- debian/libnymea-networkmanager-dev.install.in | 4 ++-- libnymea-networkmanager/libnymea-networkmanager.pro | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/libnymea-networkmanager-dev.install.in b/debian/libnymea-networkmanager-dev.install.in index 482577f..0a2849e 100644 --- a/debian/libnymea-networkmanager-dev.install.in +++ b/debian/libnymea-networkmanager-dev.install.in @@ -1,3 +1,3 @@ usr/lib/@DEB_HOST_MULTIARCH@/libnymea-networkmanager.so -usr/include/libnymea-networkmanager/* usr/include/libnymea-networkmanager -usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/libnymea-networkmanager.pc +usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/nymea-networkmanager.pc +usr/include/nymea-networkmanager/* usr/include/nymea-networkmanager diff --git a/libnymea-networkmanager/libnymea-networkmanager.pro b/libnymea-networkmanager/libnymea-networkmanager.pro index f68c5bc..fc24c88 100644 --- a/libnymea-networkmanager/libnymea-networkmanager.pro +++ b/libnymea-networkmanager/libnymea-networkmanager.pro @@ -32,7 +32,7 @@ INSTALLS += target # install header file with relative subdirectory for(header, HEADERS) { - path = /usr/include/libnymea-networkmanager/$${dirname(header)} + path = $$[QT_INSTALL_PREFIX]/include/nymea-networkmanager/$${dirname(header)} eval(headers_$${path}.files += $${header}) eval(headers_$${path}.path = $${path}) eval(INSTALLS *= headers_$${path}) @@ -40,11 +40,11 @@ for(header, HEADERS) { # Create pkgconfig file CONFIG += create_pc create_prl no_install_prl -QMAKE_PKGCONFIG_NAME = libnymea-networkmanager +QMAKE_PKGCONFIG_NAME = nymea-networkmanager QMAKE_PKGCONFIG_DESCRIPTION = nymea networkmanager development library QMAKE_PKGCONFIG_PREFIX = $$[QT_INSTALL_PREFIX] -QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_PREFIX]/include/libnymea-networkmanager/ +QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_PREFIX]/include/nymea-networkmanager/ QMAKE_PKGCONFIG_LIBDIR = $$target.path QMAKE_PKGCONFIG_VERSION = $$VERSION_STRING -QMAKE_PKGCONFIG_FILE = libnymea-networkmanager +QMAKE_PKGCONFIG_FILE = nymea-networkmanager QMAKE_PKGCONFIG_DESTDIR = pkgconfig