aboutsummaryrefslogtreecommitdiffstats
path: root/data/Makefile.am
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2010-06-10 16:47:38 +0800
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2010-06-18 09:35:12 +0800
commita9c56d98390d3c2c592c00ceef0d10151d6f9c49 (patch)
treead1b938f224502eb7752841fc3e7644aa9732c66 /data/Makefile.am
parent96569c764125b9c80909c7cece9e37b65eb632ca (diff)
downloadgsoc2013-empathy-a9c56d98390d3c2c592c00ceef0d10151d6f9c49.tar
gsoc2013-empathy-a9c56d98390d3c2c592c00ceef0d10151d6f9c49.tar.gz
gsoc2013-empathy-a9c56d98390d3c2c592c00ceef0d10151d6f9c49.tar.bz2
gsoc2013-empathy-a9c56d98390d3c2c592c00ceef0d10151d6f9c49.tar.lz
gsoc2013-empathy-a9c56d98390d3c2c592c00ceef0d10151d6f9c49.tar.xz
gsoc2013-empathy-a9c56d98390d3c2c592c00ceef0d10151d6f9c49.tar.zst
gsoc2013-empathy-a9c56d98390d3c2c592c00ceef0d10151d6f9c49.zip
Convert to new-style schema
Diffstat (limited to 'data/Makefile.am')
-rw-r--r--data/Makefile.am22
1 files changed, 6 insertions, 16 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 8ba57bd28..13276a261 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,10 +8,11 @@ desktop_in_files = \
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
-schemasdir = $(GCONF_SCHEMA_FILE_DIR)
-schemas_in_files = empathy.schemas.in
-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-@INTLTOOL_SCHEMAS_RULE@
+gsettings_SCHEMAS = \
+ org.gnome.Empathy.gschema.xml \
+ $(NULL)
+
+@GSETTINGS_RULES@
streamingprefsdir = $(datadir)/empathy
streamingprefs_DATA = \
@@ -28,24 +29,13 @@ org.freedesktop.Telepathy.Client.Empathy.service: org.freedesktop.Telepathy.Clie
clientfiledir = $(datarootdir)/telepathy/clients
clientfile_DATA = Empathy.client
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
- if test -z "$(DESTDIR)" ; then \
- for p in $(schemas_DATA) ; do \
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p ; \
- done \
- fi
-else
-install-data-local:
-endif
-
htmldir = $(datadir)/empathy
html_DATA = Template.html
EXTRA_DIST = \
$(desktop_in_files) \
$(desktop_DATA) \
- $(schemas_in_files) \
+ $(gsettings_SCHEMAS) \
$(schemas_DATA) \
$(streamingprefs_DATA) \
$(html_DATA) \