From 565648f153792a7dea29334d04550228dacad36d Mon Sep 17 00:00:00 2001 From: infirit Date: Sat, 13 Dec 2014 15:53:22 +0100 Subject: xrdb: Use sysconfdir for .ad files, since they are settings Taken from GSD commit: 7004dce9b430069ec96f307b84dc5d9289e3c29c From: Rodrigo Moya --- plugins/xrdb/Makefile.am | 2 +- plugins/xrdb/data/Makefile.am | 2 +- plugins/xrdb/msd-xrdb-manager.c | 2 +- 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" -- cgit v1.2.1