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.

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index d7b9c438c3580d16db2080ce884e91380917523c..53fa45611bff66dd34895ac157c1229c290be7a3 100644 (file)
--- 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 51a016dc7c7f1b1a5d40ceb6b39294a6fa6c0e2a..916633d81226255fe8fe7c4e5895d0f5e0a05cb1 100644 (file)
--- 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