From: Vladislav Shchapov Date: Fri, 6 Jun 2025 16:39:02 +0000 (+0500) Subject: Add bindir into zlib.pc.in for compatibility with Cygwin and Msys2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f74b4247356883c6a3dea7b01c8bb0c6300a5116;p=thirdparty%2Fzlib-ng.git Add bindir into zlib.pc.in for compatibility with Cygwin and Msys2 Signed-off-by: Vladislav Shchapov --- diff --git a/CMakeLists.txt b/CMakeLists.txt index a1c2e26e..571979eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1096,6 +1096,12 @@ else() set(PC_INC_INSTALL_DIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") endif() +if(IS_ABSOLUTE "${CMAKE_INSTALL_BINDIR}") + set(PC_BIN_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}") +else() + set(PC_BIN_INSTALL_DIR "\${exec_prefix}/${CMAKE_INSTALL_BINDIR}") +endif() + if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}") set(PC_LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}") else() diff --git a/zlib.pc.cmakein b/zlib.pc.cmakein index df8bf9f0..a5ff63ce 100644 --- a/zlib.pc.cmakein +++ b/zlib.pc.cmakein @@ -1,6 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} symbol_prefix=@ZLIB_SYMBOL_PREFIX@ +bindir=@PC_BIN_INSTALL_DIR@ libdir=@PC_LIB_INSTALL_DIR@ sharedlibdir=${libdir} includedir=@PC_INC_INSTALL_DIR@ diff --git a/zlib.pc.in b/zlib.pc.in index 45b35989..25cc923e 100644 --- a/zlib.pc.in +++ b/zlib.pc.in @@ -1,6 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ symbol_prefix=@symbol_prefix@ +bindir=@bindir@ libdir=@libdir@ sharedlibdir=@sharedlibdir@ includedir=@includedir@