diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2018-10-26 15:12:29 +0200 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2018-11-15 13:12:48 +0000 |
| commit | 696a6b629d28bd499620a74caf71b5adbe8a62f1 (patch) | |
| tree | 35aa173b16025c82665b81b5da31f7850881d78c | |
| parent | 9983744326659c16734f4a961aa0239147070bd7 (diff) | |
| download | dbus-696a6b629d28bd499620a74caf71b5adbe8a62f1.tar.gz | |
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.
| -rw-r--r-- | cmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | 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 |