From 4b90a0bd4411a66bbe6ecf85ce89a60a58bee969 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 25 Apr 2021 08:01:21 -0500
Subject: [PATCH 3/3] akonadi revert make relocatable

---
 CMakeLists.txt            | 3 ---
 KF5AkonadiConfig.cmake.in | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e8cc81..63161b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -368,9 +368,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
diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in
index bcf7320..1574319 100644
--- a/KF5AkonadiConfig.cmake.in
+++ b/KF5AkonadiConfig.cmake.in
@@ -1,10 +1,10 @@
 @PACKAGE_INIT@

-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@")

 # 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@")

 # set the directories
 if(NOT AKONADI_INSTALL_DIR)
--
2.31.1
x/log/gnu/packages/file.scm'>
<input type='hidden' name='id' value='0c0fdae4ab6480fcb34bc907a2e2a419d3c4a3ff'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=0c0fdae4ab6480fcb34bc907a2e2a419d3c4a3ff'>root</a>/<a href='/guix/log/gnu?id=0c0fdae4ab6480fcb34bc907a2e2a419d3c4a3ff'>gnu</a>/<a href='/guix/log/gnu/packages?id=0c0fdae4ab6480fcb34bc907a2e2a419d3c4a3ff'>packages</a>/<a href='/guix/log/gnu/packages/file.scm?id=0c0fdae4ab6480fcb34bc907a2e2a419d3c4a3ff'>file.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/file.scm?id=0c0fdae4ab6480fcb34bc907a2e2a419d3c4a3ff&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-12-16 22:21:13 +0100'>2021-12-16</span></td><td><a href='/guix/commit/gnu/packages/file.scm?id=12c75628b4322853943ae0d0a833e371c02b97f4'>gnu: file: Add 5.41.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/file.scm (file-next): New variable.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2021-10-12 17:46:23 +0000'>2021-10-12</span></td><td><a href='/guix/commit/gnu/packages/file.scm?id=a1eca979fb8da842e73c42f4f53be29b169810f2'>Merge remote-tracking branch 'origin/master' into core-updates-frozen.</a></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2021-09-25 09:34:29 +0200'>2021-09-25</span></td><td><a href='/guix/commit/gnu/packages/file.scm?id=a5b2474037d749f42a816c60f0393941ba97444e'>gnu: Consolidate duplicate copyright names.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/android.scm: Consolidate copyright lines with the same email address.
* gnu/packages/code.scm: Likewise.
* gnu/packages/cpp.scm: Likewise.
* gnu/packages/databases.scm: Likewise.
* gnu/packages/emacs-xyz.scm: Likewise.
* gnu/packages/file.scm: Likewise.
* gnu/packages/freedesktop.scm: Likewise.
* gnu/packages/gl.scm: Likewise.
* gnu/packages/gps.scm: Likewise.
* gnu/packages/linux.scm: Likewise.
* gnu/packages/networking.scm: Likewise.
* gnu/packages/python-xyz.scm: Likewise.
* gnu/packages/python.scm: Likewise.
* gnu/packages/video.scm: Likewise.
* gnu/packages/xdisorg.scm: Likewise.
* gnu/services/web.scm: Likewise.

Signed-off-by: Liliana Marie Prikler &lt;liliana.prikler@gmail.com&gt;
</span></span></td><td>Greg Hogan</td></tr>