From 696a6b629d28bd499620a74caf71b5adbe8a62f1 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Fri, 26 Oct 2018 15:12:29 +0200 Subject: Avoid double slashes in paths created by pkg-config If in a .pc variable a path is created from another variable, such as exec_prefix=${prefix}/lib, prefix must not contain a trailing slash to avoid double slashes in the generated path. --- cmake/CMakeLists.txt | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index d7b9c438..53fa4561 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -671,7 +671,7 @@ if(UNIX) endforeach() set(original_prefix "${CMAKE_INSTALL_PREFIX}") if(DBUS_RELOCATABLE) - set(pkgconfig_prefix "\${pcfiledir}/../../") + set(pkgconfig_prefix "\${pcfiledir}/../..") else() set(pkgconfig_prefix "\${original_prefix}") endif() diff --git a/configure.ac b/configure.ac index 51a016dc..916633d8 100644 --- a/configure.ac +++ b/configure.ac @@ -1584,7 +1584,7 @@ AS_IF([test "x$enable_relocation" = xauto], AS_IF([test "x$enable_relocation" = xyes], - [AC_SUBST([pkgconfig_prefix], ['${pcfiledir}/../../'])], + [AC_SUBST([pkgconfig_prefix], ['${pcfiledir}/../..'])], [AC_SUBST([pkgconfig_prefix], ['${original_prefix}'])]) #### Directory to source sysconfdir configuration from -- cgit v1.2.1