From 07adf63601be3e463702947a526aed0e7353d38a Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 18 Sep 2015 16:01:08 +0100
Subject: [PATCH 5/5] Replace build-time prefix with installation prefix to
 include config files

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92028
---
 bus/config-parser.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/bus/config-parser.c b/bus/config-parser.c
index 3f59730..0137b0d 100644
--- a/bus/config-parser.c
+++ b/bus/config-parser.c
@@ -2122,7 +2122,8 @@ make_full_path (const DBusString *basedir,
 {
   if (_dbus_path_is_absolute (filename))
     {
-      return _dbus_string_copy (filename, 0, full_path, 0);
+      if (!_dbus_string_copy (filename, 0, full_path, 0))
+        return FALSE;
     }
   else
     {
@@ -2131,9 +2132,12 @@ make_full_path (const DBusString *basedir,
       
       if (!_dbus_concat_dir_and_file (full_path, filename))
         return FALSE;
-
-      return TRUE;
     }
+
+  if (!_dbus_replace_install_prefix_str (full_path))
+    return FALSE;
+
+  return TRUE;
 }
 
 static dbus_bool_t
-- 
2.5.1