On Windows, load local configuration relative to bus setup

This makes an installed tree with

    /some-prefix/
        etc/
            dbus-1/
                session-local.conf
        share/
            dbus-1/
                session.conf

relocatable to any location.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92028
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Tested-by: Ralf Habacker <ralf.habacker@freenet.de>

4 files changed, 16 insertions, 18 deletions

diff --git a/bus/legacy-config/session.conf.in b/bus/legacy-config/session.conf.in
index aaea9104..b35024e6 100644
--- a/bus/legacy-config/session.conf.in
+++ b/bus/legacy-config/session.conf.in
@@ -3,17 +3,16 @@ This configuration file is no longer required and may be removed.
 
 In older versions of dbus, this file defined the behaviour of the well-known
 session bus. That behaviour is now determined by
-@DBUS_DATADIR@/dbus-1/session.conf, which should not be edited.
+@DATADIR_FROM_PKGSYSCONFDIR@/dbus-1/session.conf, which should not be edited.
 
 For local configuration changes, create a file
-@DBUS_SYSCONFDIR@/dbus-1/session-local.conf or files matching
-@DBUS_SYSCONFDIR@/dbus-1/session.d/*.conf, with a <busconfig>
-element containing configuration directives. These directives can
-override D-Bus or OS defaults.
+session-local.conf or files matching session.d/*.conf in the same directory
+as this one, with a <busconfig> element containing configuration directives.
+These directives can override D-Bus or OS defaults.
 
 For upstream or distribution-wide defaults that can be overridden
 by a local sysadmin, create files matching
-@DBUS_DATADIR@/dbus-1/session.d/*.conf instead.
+@DATADIR_FROM_PKGSYSCONFDIR@/dbus-1/session.d/*.conf instead.
 -->
 <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
diff --git a/bus/legacy-config/system.conf.in b/bus/legacy-config/system.conf.in
index 84ed2967..17aba08b 100644
--- a/bus/legacy-config/system.conf.in
+++ b/bus/legacy-config/system.conf.in
@@ -3,17 +3,16 @@ This configuration file is no longer required and may be removed.
 
 In older versions of dbus, this file defined the behaviour of the well-known
 system bus. That behaviour is now determined by
-@DBUS_DATADIR@/dbus-1/system.conf, which should not be edited.
+@DATADIR_FROM_PKGSYSCONFDIR@/dbus-1/system.conf, which should not be edited.
 
 For local configuration changes, create a file
-@DBUS_SYSCONFDIR@/dbus-1/system-local.conf or files matching
-@DBUS_SYSCONFDIR@/dbus-1/system.d/*.conf, with a <busconfig>
-element containing configuration directives. These directives can
-override D-Bus or OS defaults.
+system-local.conf or files matching system.d/*.conf in the same directory
+as this one, with a <busconfig> element containing configuration directives.
+These directives can override D-Bus or OS defaults.
 
 For upstream or distribution-wide defaults that can be overridden
 by a local sysadmin, create files matching
-@DBUS_DATADIR@/dbus-1/system.d/*.conf instead.
+@DATADIR_FROM_PKGSYSCONFDIR@/dbus-1/system.d/*.conf instead.
 -->
 <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
diff --git a/bus/session.conf.in b/bus/session.conf.in
index 97e1f673..affa7f1d 100644
--- a/bus/session.conf.in
+++ b/bus/session.conf.in
@@ -36,17 +36,17 @@
   </policy>
 
   <!-- Include legacy configuration location -->
-  <include ignore_missing="yes">@DBUS_SYSCONFDIR@/dbus-1/session.conf</include>
+  <include ignore_missing="yes">@SYSCONFDIR_FROM_PKGDATADIR@/dbus-1/session.conf</include>
 
   <!-- Config files are placed here that among other things, 
        further restrict the above policy for specific services. -->
   <includedir>session.d</includedir>
 
-  <includedir>@DBUS_SYSCONFDIR@/dbus-1/session.d</includedir>
+  <includedir>@SYSCONFDIR_FROM_PKGDATADIR@/dbus-1/session.d</includedir>
 
   <!-- This is included last so local configuration can override what's 
        in this standard file -->
-  <include ignore_missing="yes">@DBUS_SYSCONFDIR@/dbus-1/session-local.conf</include>
+  <include ignore_missing="yes">@SYSCONFDIR_FROM_PKGDATADIR@/dbus-1/session-local.conf</include>
 
   <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
 
diff --git a/bus/system.conf.in b/bus/system.conf.in
index 3679115e..014f67ee 100644
--- a/bus/system.conf.in
+++ b/bus/system.conf.in
@@ -98,17 +98,17 @@
   </policy>
 
   <!-- Include legacy configuration location -->
-  <include ignore_missing="yes">@DBUS_SYSCONFDIR@/dbus-1/system.conf</include>
+  <include ignore_missing="yes">@SYSCONFDIR_FROM_PKGDATADIR@/dbus-1/system.conf</include>
 
   <!-- Config files are placed here that among other things, punch 
        holes in the above policy for specific services. -->
   <includedir>system.d</includedir>
 
-  <includedir>@DBUS_SYSCONFDIR@/dbus-1/system.d</includedir>
+  <includedir>@SYSCONFDIR_FROM_PKGDATADIR@/dbus-1/system.d</includedir>
 
   <!-- This is included last so local configuration can override what's 
        in this standard file -->
-  <include ignore_missing="yes">@DBUS_SYSCONFDIR@/dbus-1/system-local.conf</include>
+  <include ignore_missing="yes">@SYSCONFDIR_FROM_PKGDATADIR@/dbus-1/system-local.conf</include>
 
   <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>