kauth: install helpers at proper location - another libexecdir move leftover

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2016-09-14 23:54:59 +02:00
parent b915c3eb52
commit 5a278a7daf
5 changed files with 2 additions and 34 deletions

View File

@@ -1,31 +0,0 @@
From 11d6fc16310d1f6f49cdcabe74c3f649c0b23350 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 22 Jul 2015 12:58:30 +0200
Subject: [PATCH 2/3] align installation location for helpers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0124800..7ad7b42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ option(AUTOTESTS "Perform autotests" ON)
find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
-set(KAUTH_HELPER_INSTALL_DIR "${KDE_INSTALL_LIBEXECDIR}/kauth")
+set(KAUTH_HELPER_INSTALL_DIR "${KDE_INSTALL_LIBEXECDIR}")
if(IS_ABSOLUTE ${KAUTH_HELPER_INSTALL_DIR})
set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR ${KAUTH_HELPER_INSTALL_DIR})
--
2.1.0

View File

@@ -4,4 +4,4 @@ inherit native
DEPENDS += "kcoreaddons-native"
SRC_URI += "file://0003-build-kauth-policy-gen-only-with-for-polkit-qt-1-bac.patch"
SRC_URI += "file://0002-build-kauth-policy-gen-only-with-for-polkit-qt-1-bac.patch"

View File

@@ -7,7 +7,7 @@ DEPENDS += "${BPN}-native kcoreaddons polkit-qt-1"
EXTRA_OECMAKE += "-DKAUTH_BACKEND_NAME=POLKITQT5-1"
# executables
CMAKE_ALIGN_SYSROOT[1] = "KF5Auth, -s${_IMPORT_PREFIX}/libexec/kauth-policy-gen, -S${STAGING_LIBEXECDIR_NATIVE}/kauth-policy-gen"
CMAKE_ALIGN_SYSROOT[1] = "KF5Auth, -s${_IMPORT_PREFIX}/libexec/kauth/kauth-policy-gen, -S${STAGING_LIBEXECDIR_NATIVE}/kauth/kauth-policy-gen"
FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}"
FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/*/*/.debug"

View File

@@ -12,7 +12,6 @@ SRC_URI[sha256sum] = "1d62b32d88ba6c1e71e7b3ef67366710b9ce4488bcf82280fbe70d79b5
SRC_URI += " \
file://0001-Make-autotests-optional.patch \
file://0002-align-installation-location-for-helpers.patch \
"
EXTRA_OECMAKE += "-DAUTOTESTS=OFF"