From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Fri, 26 Oct 2018 13:12:29 +0000 (+0200)
Subject: Avoid double slashes in paths created by pkg-config
X-Git-Tag: dbus-1.13.8~36^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=696a6b629d28bd499620a74caf71b5adbe8a62f1;p=thirdparty%2Fdbus.git

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 d7b9c438c..53fa45611 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 51a016dc7..916633d81 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