From 7156064bdd1cec914bafa6376ab95532d9ee2a4b Mon Sep 17 00:00:00 2001 From: Philip Chimento Date: Sun, 27 Feb 2011 10:13:28 +0100 Subject: [PATCH] Properly install gschema file Use the official autoconf and makefile rules for installing the gschema file. --- configure.ac | 1 + player/.gitignore | 1 + player/Makefile.am | 7 ++----- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 81c8d5b..25352f3 100644 --- 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 0f173a3..ec0fa4d 100644 --- 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 b548e64..70d8e73 100644 --- 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 -- 2.30.2