[gconf] Look in datadir instead of hardcoding /usr/share

[Matthias Clasen <matthiasc src gnome org>]

commit 622d5a96956bb4a5ba20ab3da31ad0089fbd76d2
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon May 3 12:31:55 2010 -0400

    Look in datadir instead of hardcoding /usr/share

 gsettings/Makefile.am              |    1 +
 gsettings/gsettings-data-convert.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/gsettings/Makefile.am b/gsettings/Makefile.am
index dff7a3e..279c76f 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 0164dca..3fa0712 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;