summaryrefslogtreecommitdiff
path: root/logview/data/Makefile.am
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-11-15 12:40:21 -0800
committerStefano Karapetsas <[email protected]>2012-11-15 12:40:21 -0800
commit0402d2a3d30ec2175eb3ea4cd2a801bf589d3388 (patch)
treec185cf295dfd1d80ffd4792088e179d001ae39a2 /logview/data/Makefile.am
parent381d345351f1d3a0fb34bb125f1411af61ce67ad (diff)
parent1aa6079a48aacd1b495f6944848e3d432a4b115d (diff)
downloadmate-utils-0402d2a3d30ec2175eb3ea4cd2a801bf589d3388.tar.bz2
mate-utils-0402d2a3d30ec2175eb3ea4cd2a801bf589d3388.tar.xz
Merge pull request #7 from bhull2010/master
Port logview to Gsettings
Diffstat (limited to 'logview/data/Makefile.am')
-rw-r--r--logview/data/Makefile.am22
1 files changed, 8 insertions, 14 deletions
diff --git a/logview/data/Makefile.am b/logview/data/Makefile.am
index 04efb96a..eb96fcbb 100644
--- a/logview/data/Makefile.am
+++ b/logview/data/Makefile.am
@@ -10,27 +10,21 @@ $(desktop_in_files): $(desktop_in_files:.desktop.in=.desktop.in.in)
man_MANS = mate-system-log.1
-schemasdir = $(MATECONF_SCHEMA_FILE_DIR)
-schemas_in_files = mate-system-log.schemas.in
-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-@INTLTOOL_SCHEMAS_RULE@
+gsettingsschema_in_files = org.mate.system-log.gschema.xml.in
+gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
+.PRECIOUS: $(gsettings_SCHEMAS)
-install-data-local: $(schemas_DATA)
-if MATECONF_SCHEMAS_INSTALL
- if test -z "$(DESTDIR)" ; then \
- for p in $^ ; do \
- MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \
- done \
- fi
-endif
+@INTLTOOL_XML_NOMERGE_RULE@
+
+@GSETTINGS_RULES@
EXTRA_DIST = \
mate-system-log.desktop.in.in \
$(xml_DATA) \
$(man_MANS) \
- $(schemas_in_files)
+ $(gsettingsschema_in_files)
DISTCLEANFILES = \
$(desktop_DATA) \
$(desktop_in_files) \
- $(schemas_DATA)
+ $(gsettings_SCHEMAS)