diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-08-22 00:37:48 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-08-22 00:37:48 +0800 |
| commit | 84e30dab1428affe335ef904377d07f8b5fdeb66 (patch) | |
| tree | fee9c8ec124a2b5804f6bb4ee31772db56a6e374 /data/Makefile.am | |
| parent | fd8e9c5dc2584055177c7a79021cdd53ca431c22 (diff) | |
| parent | 3803736b4326d4bc00d58ccd25f910907f0b4521 (diff) | |
| download | gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.gz gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.bz2 gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.lz gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.xz gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.zst gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.zip | |
Merge back from master
Diffstat (limited to 'data/Makefile.am')
| -rw-r--r-- | data/Makefile.am | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 2182ed0f5..43c3bb66c 100644 --- 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 = \ |