From bc018b4bc816a3b51deb9739bedbf8a2268d0684 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 22 Dec 2017 17:36:03 +0300 Subject: [PATCH] Revert "Make Akonadi installation properly relocatable" This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a. --- CMakeLists.txt | 3 --- KF5AkonadiConfig.cmake.in | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) Index: akonadi-19.08.0/CMakeLists.txt =================================================================== --- akonadi-19.08.0.orig/CMakeLists.txt +++ akonadi-19.08.0/CMakeLists.txt @@ -306,9 +306,6 @@ configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} - PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR - AKONADI_INCLUDE_DIR - KF5Akonadi_DATA_DIR ) install(FILES Index: akonadi-19.08.0/KF5AkonadiConfig.cmake.in =================================================================== --- akonadi-19.08.0.orig/KF5AkonadiConfig.cmake.in +++ akonadi-19.08.0/KF5AkonadiConfig.cmake.in @@ -26,8 +26,8 @@ if(BUILD_TESTING) find_dependency(Qt5Test "@QT_REQUIRED_VERSION@") endif() -set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@") -set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@") +set_and_check(AKONADI_DBUS_INTERFACES_DIR "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@") +set_and_check(AKONADI_INCLUDE_DIR "@AKONADI_INCLUDE_DIR@") find_dependency(Boost "@Boost_MINIMUM_VERSION@") @@ -35,7 +35,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5Ako include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake) # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed -set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@") +set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@") #################################################################################### # CMAKE_AUTOMOC