Properly install gschema file

Use the official autoconf and makefile rules for installing the gschema
file.

diff --git a/configure.ac b/configure.ac
index 81c8d5b171925ba9b0a54b7d779753c579cdc4c4..25352f305e63b18e630471be6416d28afdf3cf82 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -55,6 +55,7 @@ AM_GNU_GETTEXT([external])   # Gettext, link to system libintl
 IT_PROG_INTLTOOL([0.40.0])   # Intltool
 PKG_PROG_PKG_CONFIG          # pkg_config
 GTK_DOC_CHECK($GTK_DOC_REQUIRED_VERSION) 
+GLIB_GSETTINGS               # GSettings
 # Other utilities used in this package's various make scripts
 AC_PROG_AWK
 AC_PATH_PROG([PERL], [perl]) # Perl

diff --git a/player/.gitignore b/player/.gitignore
index 0f173a3e75d0765116960fed66c3d5d4245b49d5..ec0fa4d340267f7b3129b892da63b61b6f938a3d 100644 (file)
--- a/player/.gitignore
+++ b/player/.gitignore
@@ -5,3 +5,4 @@ Makefile.in
 *.o
 chimara
 chimara.menus
+*.gschema.valid

diff --git a/player/Makefile.am b/player/Makefile.am
index b548e64df45788a8a6942ffbab3ab15d952fa867..70d8e73e358b32b3459255d6b182c048f4cf863f 100644 (file)
--- a/player/Makefile.am
+++ b/player/Makefile.am
@@ -24,10 +24,7 @@ chimara_CPPFLAGS = $(AM_CPPFLAGS) \
 chimara_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS)
 chimara_LDADD = @TEST_LIBS@ $(top_builddir)/libchimara/libchimara.la
 
-schemasdir = $(datadir)/glib-2.0/schemas
-dist_schemas_DATA = org.chimara-if.gschema.xml
-
-install-data-hook:
-       glib-compile-schemas $(datadir)/glib-2.0/schemas
+gsettings_SCHEMAS = org.chimara-if.gschema.xml
+@GSETTINGS_RULES@
 
 endif