From c71cb3c049f191734d90cd144cd5ec8920c02abe Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Sat, 22 May 2010 08:34:12 +0000
Subject: [shell] Do not use the gconf gsettings backend any more

  - rename keys to follow gsettings name restrictions (s/_/-/)
  - remove the hardcoding of the gconf backend
  - use new gsettings macros as they have changed in glib 2.25.6

Based on patch by Matthias Clasen, see bug #619335.
---
(limited to 'data/Makefile.am')

diff --git a/data/Makefile.am b/data/Makefile.am
index feb5230..31fceaa 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -50,19 +50,16 @@ endif
 #
 # GSettings schema
 #
-
-# gsettingsschemadir and gschema_compile are defined by the GLIB_GSETTINGS
-# macro in configure.ac
 gsettingsschema_in_files = org.gnome.Evince.gschema.xml.in
-gsettingsschema_DATA = $(gsettingsschema_in_files:.xml.in=.xml)
+# gsettings_SCHEMAS is a list of all the schemas you want to install
+gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
+
+.PRECIOUS: $(gsettings_SCHEMAS)
+
 @INTLTOOL_XML_NOMERGE_RULE@
-# This rule will check your schemas for validity before installation
-# Uncomment when porting is done
-# GSETTINGS_CHECK_RULE
-if GSETTINGS_SCHEMAS_INSTALL
-install-data-hook:
-	$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --allow-any-name $(DESTDIR)$(gsettingsschemadir) --targetdir=$(DESTDIR)$(gsettingsschemadir)
-endif
+
+# include the appropriate makefile rules for schema handling
+@GSETTINGS_RULES@
 
 #
 # GTK icon cache
--
cgit v0.9.1