From c8fcb4f374ba8b4cf486b47c3479bf59d6dcf350 Mon Sep 17 00:00:00 2001
From: He Yong <hyyoxhk@163.com>
Date: Tue, 27 Jul 2021 05:50:35 +0900
Subject: [PATCH 1/2] Use CMAKE_INSTALL_INCLUDEDIR instead of
 CMAKE_INSTALL_FULL_INCLUDEDIR

---
 src/lib/fcitx-config/CMakeLists.txt | 2 +-
 src/lib/fcitx-utils/CMakeLists.txt  | 2 +-
 src/lib/fcitx/CMakeLists.txt        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/fcitx-config/CMakeLists.txt b/src/lib/fcitx-config/CMakeLists.txt
index 60bfa14ac..fcbe47fb4 100644
--- a/src/lib/fcitx-config/CMakeLists.txt
+++ b/src/lib/fcitx-config/CMakeLists.txt
@@ -42,7 +42,7 @@ set_target_properties(Fcitx5Config
 target_include_directories(Fcitx5Config PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/..>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}/Fcitx5/Config>)
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/Fcitx5/Config>)
 target_link_libraries(Fcitx5Config PUBLIC Fcitx5::Utils)
 
 configure_file(Fcitx5Config.pc.in ${CMAKE_CURRENT_BINARY_DIR}/Fcitx5Config.pc @ONLY)
diff --git a/src/lib/fcitx-utils/CMakeLists.txt b/src/lib/fcitx-utils/CMakeLists.txt
index fe71b8f88..150d5115f 100644
--- a/src/lib/fcitx-utils/CMakeLists.txt
+++ b/src/lib/fcitx-utils/CMakeLists.txt
@@ -149,7 +149,7 @@ set_target_properties(Fcitx5Utils
 target_include_directories(Fcitx5Utils PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/..>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}/Fcitx5/Utils>)
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/Fcitx5/Utils>)
 target_link_libraries(Fcitx5Utils PRIVATE DL::DL LibIntl::LibIntl Pthread::Pthread)
 if(LIBKVM_FOUND)
     target_link_libraries(Fcitx5Utils PRIVATE LibKVM::LibKVM)
diff --git a/src/lib/fcitx/CMakeLists.txt b/src/lib/fcitx/CMakeLists.txt
index 0cf004fec..2c5fe41be 100644
--- a/src/lib/fcitx/CMakeLists.txt
+++ b/src/lib/fcitx/CMakeLists.txt
@@ -79,7 +79,7 @@ endif()
 target_include_directories(Fcitx5Core PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/..>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}/Fcitx5/Core>)
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/Fcitx5/Core>)
 target_link_libraries(Fcitx5Core PUBLIC Fcitx5::Config Fcitx5::Utils PRIVATE LibIntl::LibIntl)
 if (ENABLE_KEYBOARD)
     target_link_libraries(Fcitx5Core PRIVATE XKBCommon::XKBCommon)

From bbae1748d6ea971e4f8673ff8917d94e97c32678 Mon Sep 17 00:00:00 2001
From: He Yong <hyyoxhk@163.com>
Date: Wed, 12 Apr 2023 23:59:44 +0800
Subject: [PATCH 2/2] Use CMAKE_INSTALL_FULL_LIBDIR instead of
 CMAKE_INSTALL_LIBDIR

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 07ffb92af..34480d3db 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,7 +188,7 @@ endif()
 
 # directory needed by bsd
 if(NOT CMAKE_INSTALL_LIBDATADIR)
-  set(CMAKE_INSTALL_LIBDATADIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "libdata root (LIBDIR)")
+  set(CMAKE_INSTALL_LIBDATADIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "libdata root (LIBDIR)")
 endif()
 
 GNUInstallDirs_get_absolute_install_dir(CMAKE_INSTALL_FULL_LIBDATADIR CMAKE_INSTALL_LIBDATADIR LIBDATADIR)