Merge back from master

[empathy.git] / data / Makefile.am

diff --git a/data/Makefile.am b/data/Makefile.am
index 2182ed0f526e8fb09ba144a0c0b1d566ec57a6b5..43c3bb66c530ac9c9fec6796034e205cbafde7a1 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -10,6 +10,11 @@ schemas_in_files = empathy.schemas.in
 schemas_DATA    = $(schemas_in_files:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
 
+streamingprefsdir =  $(datadir)/empathy
+streamingprefs_DATA =          \
+       codec-preferences       \
+       element-properties
+
 if GCONF_SCHEMAS_INSTALL
 install-data-local:
        if test -z "$(DESTDIR)" ; then \
@@ -29,6 +34,7 @@ EXTRA_DIST =                          \
        $(desktop_DATA)                 \
        $(schemas_in_files)             \
        $(schemas_DATA)                 \
+       $(streamingprefs_DATA)          \
        $(html_DATA)
 
 DISTCLEANFILES =                       \