39b3d10267
Primary source: https://github.com/berrange/yajl/tree/fedora-dist-git Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
From a319e9c853d787a9033e14436a5a80381e954a26 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
|
Date: Mon, 10 Jul 2023 13:42:30 +0100
|
|
Subject: [PATCH 1/8] pkg-config file should be in lib dir, not shared data dir
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
---
|
|
src/CMakeLists.txt | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index 99cf9e9..789ddf9 100644
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -30,7 +30,7 @@ ADD_DEFINITIONS(-DYAJL_BUILD)
|
|
# set up some paths
|
|
SET (libDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib)
|
|
SET (incDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/include/yajl)
|
|
-SET (shareDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/share/pkgconfig)
|
|
+SET (pkgconfigDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib/pkgconfig)
|
|
|
|
# set the output path for libraries
|
|
SET(LIBRARY_OUTPUT_PATH ${libDir})
|
|
@@ -61,7 +61,7 @@ FILE(MAKE_DIRECTORY ${incDir})
|
|
# generate build-time source
|
|
SET(dollar $)
|
|
CONFIGURE_FILE(api/yajl_version.h.cmake ${incDir}/yajl_version.h)
|
|
-CONFIGURE_FILE(yajl.pc.cmake ${shareDir}/yajl.pc)
|
|
+CONFIGURE_FILE(yajl.pc.cmake ${pkgconfigDir}/yajl.pc)
|
|
|
|
# copy public headers to output directory
|
|
FOREACH (header ${PUB_HDRS})
|
|
@@ -84,4 +84,4 @@ INSTALL(TARGETS yajl
|
|
INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX})
|
|
INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl)
|
|
INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl)
|
|
-INSTALL(FILES ${shareDir}/yajl.pc DESTINATION share/pkgconfig)
|
|
+INSTALL(FILES ${pkgconfigDir}/yajl.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
|
|
--
|
|
2.41.0
|
|
|