aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2010-06-29 12:08:14 +0800
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2010-06-29 12:08:14 +0800
commit406dc93dff623caa69b1b416d526cfd2030aa09a (patch)
treead2b3dea96759debfa00e201faafac133d6b498b
parentf563f6d7383c61c560d22a7e500dddb499cdea11 (diff)
downloadgsoc2013-empathy-406dc93dff623caa69b1b416d526cfd2030aa09a.tar
gsoc2013-empathy-406dc93dff623caa69b1b416d526cfd2030aa09a.tar.gz
gsoc2013-empathy-406dc93dff623caa69b1b416d526cfd2030aa09a.tar.bz2
gsoc2013-empathy-406dc93dff623caa69b1b416d526cfd2030aa09a.tar.lz
gsoc2013-empathy-406dc93dff623caa69b1b416d526cfd2030aa09a.tar.xz
gsoc2013-empathy-406dc93dff623caa69b1b416d526cfd2030aa09a.tar.zst
gsoc2013-empathy-406dc93dff623caa69b1b416d526cfd2030aa09a.zip
Fix up distribution of GSettings schemas
-rw-r--r--data/Makefile.am16
1 files changed, 9 insertions, 7 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index d1f00794d..016c3db8d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,10 +8,10 @@ desktop_in_files = \
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
-gsettings_SCHEMAS = \
- org.gnome.Empathy.gschema.xml \
+gsettings_files = \
+ org.gnome.Empathy.gschema.xml.in \
$(NULL)
-
+gsettings_SCHEMAS = $(gsettings_files:.xml.in=.xml)
@INTLTOOL_XML_NOMERGE_RULE@
@GSETTINGS_RULES@
@@ -41,15 +41,17 @@ EXTRA_DIST = \
$(convert_DATA) \
$(desktop_in_files) \
$(desktop_DATA) \
- $(gsettings_SCHEMAS) \
$(schemas_DATA) \
$(streamingprefs_DATA) \
$(html_DATA) \
$(clientfile_DATA) \
- $(servicefile_in_files)
+ $(servicefile_in_files) \
+ $(gsettings_files) \
+ $(NULL)
DISTCLEANFILES = \
$(desktop_DATA) \
$(schemas_DATA) \
- $(servicefile_DATA)
-
+ $(servicefile_DATA) \
+ $(gsettings_SCHEMAS) \
+ $(NULL)