From 1aa0cddb825020fb83249e5471a7b99595aa5db5 Mon Sep 17 00:00:00 2001 From: Niels Breet Date: Thu, 28 May 2020 10:32:26 +0000 Subject: [PATCH] [aarch64] Use macros, not hardcoded paths. Contributes to JB#50027 --- rpm/nemo-qml-plugin-devicelock.spec | 3 +-- src/nemo-devicelock/host/host.pro | 2 +- src/nemo-devicelock/lib.pro | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/rpm/nemo-qml-plugin-devicelock.spec b/rpm/nemo-qml-plugin-devicelock.spec index aac2484..17814da 100644 --- a/rpm/nemo-qml-plugin-devicelock.spec +++ b/rpm/nemo-qml-plugin-devicelock.spec @@ -2,9 +2,8 @@ Name: nemo-qml-plugin-devicelock Summary: Device lock plugin for Nemo Mobile Version: 0.2.22 Release: 1 -Group: System/Libraries License: LGPLv2.1 -URL: https://git.merproject.org/mer-core/nemo-qml-plugin-devicelock +URL: https://git.sailfishos.org/mer-core/nemo-qml-plugin-devicelock Source0: %{name}-%{version}.tar.bz2 BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Core) diff --git a/src/nemo-devicelock/host/host.pro b/src/nemo-devicelock/host/host.pro index 70e9f1b..f51a127 100644 --- a/src/nemo-devicelock/host/host.pro +++ b/src/nemo-devicelock/host/host.pro @@ -62,7 +62,7 @@ headers.path = /usr/include/nemo-devicelock/host prf.files = nemo-devicelock-host.prf prf.path = $$[QT_INSTALL_DATA]/mkspecs/features -target.path = /usr/lib +target.path = $$[QT_INSTALL_LIBS] INSTALLS += \ headers \ diff --git a/src/nemo-devicelock/lib.pro b/src/nemo-devicelock/lib.pro index 8f645ce..9a4d781 100644 --- a/src/nemo-devicelock/lib.pro +++ b/src/nemo-devicelock/lib.pro @@ -56,7 +56,7 @@ public_headers.path = /usr/include/nemo-devicelock private_headers.files = $$PRIVATE_HEADERS private_headers.path = /usr/include/nemo-devicelock/private -target.path = /usr/lib +target.path = $$[QT_INSTALL_LIBS] QMAKE_PKGCONFIG_NAME = nemodevicelock QMAKE_PKGCONFIG_DESCRIPTION = Library for Nemo device lock.