From 9cd715b3b1f5accc2e7cd0b167808c1a47a08938 Mon Sep 17 00:00:00 2001 From: Matthew Smith Date: Sat, 4 Jun 2022 09:22:37 +0100 Subject: [PATCH 1/2] build: Install .pc file in correct directory /usr/share/pkgconfig should be used for architecture independent libraries (e.g. data or scripts), while an architecture dependent directory like /usr/lib64/pkgconfig should be used for native binaries. Co-authored-by: Sam James --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ac966f8..ce6ade1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,7 +173,7 @@ if(NOT BUILD_HEADER_ONLY) if(INSTALL_PROJECT) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/miniz.pc - DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) endif() endif() From 37ea28133d9abea3926248c9517676be9b558ca7 Mon Sep 17 00:00:00 2001 From: Matthew Smith Date: Sat, 4 Jun 2022 09:31:06 +0100 Subject: [PATCH 2/2] build: Set pkgconfig includedir to miniz directory Allows users to include instead of which seems to be the intended behaviour. --- miniz.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/miniz.pc.in b/miniz.pc.in index 95faf5f..3ba7226 100644 --- a/miniz.pc.in +++ b/miniz.pc.in @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/miniz Name: @PROJECT_NAME@ Description: @PROJECT_DESCRIPTION@