From 92af98620050c826def7529cd0cee2fc699b0ddb Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 15 Jul 2023 11:09:46 +0000 Subject: [PATCH] shorten prefix --- configure.ac | 12 ++++++------ libssh2.pc.in | 4 ++-- src/CMakeLists.txt | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index afedef6a1f..cbded693ef 100644 --- a/configure.ac +++ b/configure.ac @@ -394,14 +394,14 @@ LIBS="${LIBS} ${LTLIBZ}" dnl merge the pkg-config private fields into public ones when static-only if test "x$enable_shared" = "xyes"; then - LIBSSH2_PKGCONFIG_REQUIRES_NO_SHARED= - LIBSSH2_PKGCONFIG_LIBS_NO_SHARED= + LIBSSH2_PC_REQUIRES_NO_SHARED= + LIBSSH2_PC_LIBS_NO_SHARED= else - LIBSSH2_PKGCONFIG_REQUIRES_NO_SHARED=$LIBSREQUIRED - LIBSSH2_PKGCONFIG_LIBS_NO_SHARED=$LIBS + LIBSSH2_PC_REQUIRES_NO_SHARED=$LIBSREQUIRED + LIBSSH2_PC_LIBS_NO_SHARED=$LIBS fi -AC_SUBST(LIBSSH2_PKGCONFIG_REQUIRES_NO_SHARED) -AC_SUBST(LIBSSH2_PKGCONFIG_LIBS_NO_SHARED) +AC_SUBST(LIBSSH2_PC_REQUIRES_NO_SHARED) +AC_SUBST(LIBSSH2_PC_LIBS_NO_SHARED) AC_CONFIG_FILES([Makefile src/Makefile diff --git a/libssh2.pc.in b/libssh2.pc.in index 977d8dc6ee..5afa5ee998 100644 --- a/libssh2.pc.in +++ b/libssh2.pc.in @@ -14,8 +14,8 @@ Name: libssh2 URL: https://www.libssh2.org/ Description: Library for SSH-based communication Version: @LIBSSH2VER@ -Requires: @LIBSSH2_PKGCONFIG_REQUIRES_NO_SHARED@ +Requires: @LIBSSH2_PC_REQUIRES_NO_SHARED@ Requires.private: @LIBSREQUIRED@ -Libs: -L${libdir} -lssh2 @LIBSSH2_PKGCONFIG_LIBS_NO_SHARED@ +Libs: -L${libdir} -lssh2 @LIBSSH2_PC_LIBS_NO_SHARED@ Libs.private: @LIBS@ Cflags: -I${includedir} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 849f3ddd34..65ae9f53a8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -191,11 +191,11 @@ set(LIBSREQUIRED ${PC_REQUIRES_PRIVATE}) set(LIBS ${PC_LIBS}) # merge the pkg-config private fields into public ones when static-only if(BUILD_SHARED_LIBS) - set(LIBSSH2_PKGCONFIG_REQUIRES_NO_SHARED "") - set(LIBSSH2_PKGCONFIG_LIBS_NO_SHARED "") + set(LIBSSH2_PC_REQUIRES_NO_SHARED "") + set(LIBSSH2_PC_LIBS_NO_SHARED "") else() - set(LIBSSH2_PKGCONFIG_REQUIRES_NO_SHARED "${PC_REQUIRES_PRIVATE}") - set(LIBSSH2_PKGCONFIG_LIBS_NO_SHARED "${PC_LIBS}") + set(LIBSSH2_PC_REQUIRES_NO_SHARED "${PC_REQUIRES_PRIVATE}") + set(LIBSSH2_PC_LIBS_NO_SHARED "${PC_LIBS}") endif() set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix "\${prefix}")