File 0001-Don-t-hardcode-lib.patch of Package oaml

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Don-t-hardcode-lib.patch of Package oaml

From 06a276407504d20c214d759ae8822049bf7b349f Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Mon, 30 Mar 2020 16:09:51 +0200
Subject: [PATCH] Don't hardcode 'lib'

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf1a575..1f4cfe6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,8 @@ endif ()
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
 
+include(GNUInstallDirs)
+
 include(GetGitRevisionDescription)
 get_git_head_revision(GIT_REFSPEC GIT_SHA1)
 
@@ -286,9 +288,9 @@ if (ENABLE_SHARED)
 endif()
 
 configure_file("oaml.cmake.in" "oaml.cmake" @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/oaml.cmake" DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cmake/oaml/)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/oaml.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/oaml/)
 
 configure_file("oaml.pc.in" "oaml.pc" @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/oaml.pc" DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/oaml.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/)
 
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/oaml.h DESTINATION include)
diff --git a/oaml.cmake.in b/oaml.cmake.in
index e236fdb..e1f5623 100644
--- a/oaml.cmake.in
+++ b/oaml.cmake.in
@@ -1,3 +1,3 @@
 find_path(OAML_INCLUDE_DIRS NAMES oaml.h PATHS "@CMAKE_INSTALL_PREFIX@/include")
-find_library(OAML_LIBRARIES NAMES oaml PATHS "@CMAKE_INSTALL_PREFIX@/lib")
+find_library(OAML_LIBRARIES NAMES oaml PATHS "@CMAKE_INSTALL_FULL_LIBDIR@")
 set(OAML_VERSION "@OAML_VERSION@")
diff --git a/oaml.pc.in b/oaml.pc.in
index d8fe22e..c655096 100644
--- a/oaml.pc.in
+++ b/oaml.pc.in
@@ -2,7 +2,7 @@
 
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
 includedir=${prefix}/include
 
 Name: oaml
-- 
2.26.0

Places

File 0001-Don-t-hardcode-lib.patch of Package oaml

Places