diff options
author | Matthias Clasen <mclasen@redhat.com> | 2010-05-03 12:31:55 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2010-05-03 12:31:55 -0400 |
commit | 622d5a96956bb4a5ba20ab3da31ad0089fbd76d2 (patch) | |
tree | d24c99359c52b8fde910715eaeff3be6cfda34ca | |
parent | 7510f5d9056ff8fa4763fa4c16e185e42f18419d (diff) | |
download | gconf-622d5a96956bb4a5ba20ab3da31ad0089fbd76d2.tar.gz |
Look in datadir instead of hardcoding /usr/share
-rw-r--r-- | gsettings/Makefile.am | 1 | ||||
-rw-r--r-- | gsettings/gsettings-data-convert.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/gsettings/Makefile.am b/gsettings/Makefile.am index dff7a3ef..279c76fd 100644 --- a/gsettings/Makefile.am +++ b/gsettings/Makefile.am @@ -27,6 +27,7 @@ bin_PROGRAMS = gsettings-data-convert AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ + -DDATADIR=\"$(datadir)\" \ $(GSETTINGS_CFLAGS) gsettings_data_convert_SOURCES = gsettings-data-convert.c diff --git a/gsettings/gsettings-data-convert.c b/gsettings/gsettings-data-convert.c index 0164dca6..3fa07127 100644 --- a/gsettings/gsettings-data-convert.c +++ b/gsettings/gsettings-data-convert.c @@ -29,7 +29,7 @@ #include <gio/gio.h> #include <gconf/gconf-client.h> -static const gchar convert_dir[] = "/usr/share/GConf/gsettings"; +static const gchar convert_dir[] = DATADIR "/GConf/gsettings"; static gboolean verbose = FALSE; static gboolean dry_run = FALSE; |