[gconf] daemon: don't force gconf.xml.system to live in /etc

[Ray Strode <halfline src gnome org>]

commit 9839f4ccc14be55d6220144c279bf63c55486626
Author: Thomas Zajic <zlatko gmx at>
Date:   Mon Mar 14 12:52:02 2011 -0400

    daemon: don't force gconf.xml.system to live in /etc
    
    My whole GNOME lives in /usr/local, so I get the annoying "There is a
    problem with your configuration server.
    /usr/local/libexec/gconf-sanity-check-2 has exited with code 256." popup
    on each and every login.

 gconf/default.path.in |    2 +-
 gconf/gconfd.c        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gconf/default.path.in b/gconf/default.path.in
index 0caecd3..f03b4aa 100644
--- a/gconf/default.path.in
+++ b/gconf/default.path.in
@@ -21,7 +21,7 @@ include "$(HOME)/.gconf.path"
 xml:readwrite:$(HOME)/.gconf
 
 # Location for system-wide settings that are set by the defaults mechanism
-xml:readonly:/etc/gconf/gconf.xml.system
+xml:readonly:@sysgconfdir@/gconf.xml.system
 
 # To read in any defaults settings that the Sys Admin may have created
 # prior to a desktop system upgrade. The SysAdmin can stick default values
diff --git a/gconf/gconfd.c b/gconf/gconfd.c
index 2827635..b89e7a1 100644
--- a/gconf/gconfd.c
+++ b/gconf/gconfd.c
@@ -667,7 +667,7 @@ system_bus_message_handler (DBusConnection *connection,
 
 	  gconf_log (GCL_DEBUG, "System defaults changed.  Notifying.");
 
-	  addresses.data = "xml:merged:/etc/gconf/gconf.xml.system";
+	  addresses.data = "xml:merged:" GCONF_ETCDIR "/gconf.xml.system";
 	  addresses.next = NULL;
 	  system_sources = gconf_sources_new_from_addresses (&addresses, NULL);