X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=data%2FMakefile.am;h=f4295df5a0daeec5204e287fd532dca71ef9c825;hb=924ff63b3a76744b4b0f6c98fc4dd3382f219023;hp=feb52301527bcf88e1a41a07aab9cbd3c00c0b6f;hpb=b329a61d561198cd405721372580d05476c2240a;p=evince.git

diff --git a/data/Makefile.am b/data/Makefile.am
index feb52301..f4295df5 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -50,19 +50,19 @@ 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@
+
+gsettingsconvertdir = $(datadir)/GConf/gsettings
+gsettingsconvert_DATA = evince.convert
 
 #
 # GTK icon cache
@@ -94,6 +94,7 @@ EXTRA_DIST =					\
 	org.gnome.evince.Daemon.service.in	\
 	$(man_MANS)				\
 	evince.ico				\
+	evince.convert				\
 	$(NULL)
 
 #
@@ -102,7 +103,7 @@ EXTRA_DIST =					\
 
 DISTCLEANFILES = \
 	$(DESKTOP_FILES)	\
-	$(gsettingsschema_DATA)		\
+	$(gsettings_SCHEMAS)	\
 	$(service_DATA)
 
 -include $(top_srcdir)/git.mk