From e58350ab1a00d55e82f7ae97589562e10a77c485 Mon Sep 17 00:00:00 2001
From: Brent Hull <bhull2010@live.com>
Date: Sat, 27 Oct 2012 23:04:21 -0400
Subject: Port to Gsettings based on GNOME patch by Richard Hughes

---
 data/Makefile.am | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

(limited to 'data/Makefile.am')

diff --git a/data/Makefile.am b/data/Makefile.am
index 80b8a49..0f0d775 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,9 +1,5 @@
 SUBDIRS = icons
 
-@INTLTOOL_SCHEMAS_RULE@
-schemadir = $(sysconfdir)/mateconf/schemas
-schema_in_files = mate-power-manager.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
 @INTLTOOL_DESKTOP_RULE@
 desktopdir = $(datadir)/applications
@@ -23,6 +19,9 @@ service_DATA     = $(service_in_files:.service.in=.service)
 $(service_DATA): $(service_in_files) Makefile
 	@sed -e "s|\@servicedir\@|$(bindir)|" $< > $@
 
+@GSETTINGS_RULES@
+gsettings_SCHEMAS = org.mate.power-manager.gschema.xml
+
 pkgdata_DATA =						\
 	gpm-statistics.ui				\
 	gpm-statistics-deprecated.ui	\
@@ -32,25 +31,12 @@ pkgdata_DATA =						\
 	acme.ui
 
 EXTRA_DIST =						\
-	mate-power-manager.schemas.in			\
-	$(schema_in_files)				\
-	$(desktop_in_files)				\
-	$(autostart_in_files)				\
+	$(gsettings_SCHEMAS)				\
 	$(service_in_files)				\
+	$(autostart_in_files)				\
+	$(desktop_in_files)				\
 	$(pkgdata_DATA)
 
-if MATECONF_SCHEMAS_INSTALL
-install-data-local:
-	-MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) \
-	$(MATECONFTOOL) --makefile-install-rule $(schema_DATA)
-endif
-
-if MATECONF_SCHEMAS_INSTALL
-uninstall-local:
-	-MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) \
-	$(MATECONFTOOL) --makefile-uninstall-rule $(schema_DATA)
-endif
-
 clean-local :
 	rm -f *~
 
@@ -58,5 +44,4 @@ DISTCLEANFILES =					\
 	mate-power-manager.desktop			\
 	mate-power-preferences.desktop			\
 	mate-power-statistics.desktop			\
-	mate-power-manager.schemas			\
 	mate-power-manager.service
-- 
cgit v1.2.1