[gnome-settings-daemon] xrdb: Use for .ad files, since they are settings

[Rodrigo Moya <rodrigo src gnome org>]

commit 7004dce9b430069ec96f307b84dc5d9289e3c29c
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Thu Nov 4 18:32:22 2010 +0100

    xrdb: Use  for .ad files, since they are settings

 plugins/xrdb/Makefile.am        |    2 +-
 plugins/xrdb/data/Makefile.am   |    2 +-
 plugins/xrdb/gsd-xrdb-manager.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/plugins/xrdb/Makefile.am b/plugins/xrdb/Makefile.am
index 6984da1..d9515ff 100644
--- a/plugins/xrdb/Makefile.am
+++ b/plugins/xrdb/Makefile.am
@@ -17,7 +17,7 @@ libxrdb_la_SOURCES = 		\
 
 libxrdb_la_CPPFLAGS = \
 	-I$(top_srcdir)/gnome-settings-daemon		\
-	-DDATADIR=\""$(pkgdatadir)"\"	\
+	-DSYSCONFDIR=\""$(sysconfdir)"\"	\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 
diff --git a/plugins/xrdb/data/Makefile.am b/plugins/xrdb/data/Makefile.am
index e133b9b..26ff90f 100644
--- a/plugins/xrdb/data/Makefile.am
+++ b/plugins/xrdb/data/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-xrdbdir = $(pkgdatadir)/xrdb
+xrdbdir = $(sysconfdir)/xrdb
 xrdb_DATA =		\
 	General.ad	\
 	Editres.ad	\
diff --git a/plugins/xrdb/gsd-xrdb-manager.c b/plugins/xrdb/gsd-xrdb-manager.c
index be5697e..84faea6 100644
--- a/plugins/xrdb/gsd-xrdb-manager.c
+++ b/plugins/xrdb/gsd-xrdb-manager.c
@@ -42,7 +42,7 @@
 
 #define GSD_XRDB_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRDB_MANAGER, GsdXrdbManagerPrivate))
 
-#define SYSTEM_AD_DIR    DATADIR "/xrdb"
+#define SYSTEM_AD_DIR    SYSCONFDIR "/xrdb"
 #define GENERAL_AD       SYSTEM_AD_DIR "/General.ad"
 #define USER_AD_DIR      ".gnome2/xrdb"
 #define USER_X_RESOURCES ".Xresources"