1 files changed, 13 insertions, 18 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 502a7831..eab9b937 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,10 +3,16 @@ desktop_in_files = pluma.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-schemasdir = $(MATECONF_SCHEMA_FILE_DIR)
-schemas_in_files = pluma.schemas.in
-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-@INTLTOOL_SCHEMAS_RULE@
+@INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS = org.mate.pluma.gschema.xml
+@GSETTINGS_RULES@
+
+%.gschema.xml.in: %.gschema.xml.in.in Makefile
+ $(AM_V_GEN) $(SED) \
+ -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' \
+ -e 's^\@ACTIVE_PLUGINS\@^$(ACTIVE_PLUGINS)^g' \
+ -e 's^\@TOOLBAR_STYLE\@^$(TOOLBAR_STYLE)^g' \
+ < $< > $@
 
 man_MANS = pluma.1
 
@@ -16,28 +22,17 @@ pkgconfig_DATA = pluma.pc
 bugreportdir = $(libexecdir)/pluma
 bugreport_SCRIPTS = pluma-bugreport.sh
 
-if MATECONF_SCHEMAS_INSTALL
-install-data-local:
- if test -z "$(DESTDIR)" ; then \
- for p in $(schemas_DATA) ; do \
- MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \
- done \
- fi
-else
-install-data-local:
-endif
-
 EXTRA_DIST = \
 $(desktop_in_files) \
- $(schemas_in_files) \
- pluma.schemas.in.in \
+ $(gsettings_SCHEMAS_in_in) \
 $(man_MANS) \
 pluma.pc.in \
 pluma-bugreport.sh.in
 
 CLEANFILES = \
 $(desktop_DATA) \
- $(schemas_DATA) \
+ $(gsettings_SCHEMAS_in) \
+ $(gsettings_SCHEMAS) \
 $(pkgconfig_DATA)