summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-12-13 15:53:22 +0100
committerinfirit <[email protected]>2014-12-13 18:32:16 +0100
commit565648f153792a7dea29334d04550228dacad36d (patch)
tree68d5c24a24fda576b3c8533f7a678538b50bb101
parentf228d752968a3f0b607a41eed9dfb7630e1da073 (diff)
downloadmate-settings-daemon-565648f153792a7dea29334d04550228dacad36d.tar.bz2
mate-settings-daemon-565648f153792a7dea29334d04550228dacad36d.tar.xz
xrdb: Use sysconfdir for .ad files, since they are settings
Taken from GSD commit: 7004dce9b430069ec96f307b84dc5d9289e3c29c From: Rodrigo Moya <[email protected]>
-rw-r--r--plugins/xrdb/Makefile.am2
-rw-r--r--plugins/xrdb/data/Makefile.am2
-rw-r--r--plugins/xrdb/msd-xrdb-manager.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/plugins/xrdb/Makefile.am b/plugins/xrdb/Makefile.am
index 04946c8..35d4413 100644
--- a/plugins/xrdb/Makefile.am
+++ b/plugins/xrdb/Makefile.am
@@ -17,7 +17,7 @@ libxrdb_la_SOURCES = \
libxrdb_la_CPPFLAGS = \
-I$(top_srcdir)/mate-settings-daemon \
- -DDATADIR=\""$(pkgdatadir)"\" \
+ -DSYSCONFDIR=\""$(sysconfdir)"\" \
-DMATE_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/msd-xrdb-manager.c b/plugins/xrdb/msd-xrdb-manager.c
index 225f1b5..dd94d01 100644
--- a/plugins/xrdb/msd-xrdb-manager.c
+++ b/plugins/xrdb/msd-xrdb-manager.c
@@ -42,7 +42,7 @@
#define MSD_XRDB_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_XRDB_MANAGER, MsdXrdbManagerPrivate))
-#define SYSTEM_AD_DIR DATADIR "/xrdb"
+#define SYSTEM_AD_DIR SYSCONFDIR "/xrdb"
#define GENERAL_AD SYSTEM_AD_DIR "/General.ad"
#define USER_AD_DIR ".config/mate/xrdb"
#define USER_X_RESOURCES ".Xresources"