diff options
| -rw-r--r-- | data/Makefile.am | 22 | ||||
| -rw-r--r-- | data/empathy.schemas.in (renamed from libempathy-gtk/empathy.schemas.in) | 2 | ||||
| -rw-r--r-- | libempathy-gtk/Makefile.am | 22 |
3 files changed, 23 insertions, 23 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 06f7e87a6..a39621f35 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -25,9 +25,29 @@ autostart_in_files = empathy.desktop.in autostart_DATA = $(autostart_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@ + +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 $(srcdir)/$$p ; \ + done \ + fi +else +install-data-local: +endif + EXTRA_DIST = \ $(image_DATA) \ $(autostart_DATA) \ - $(profile_DATA) + $(profile_DATA) \ + $(schemas_in_files) \ + $(schemas_DATA) +DISTCLEANFILES = \ + $(schemas_DATA) diff --git a/libempathy-gtk/empathy.schemas.in b/data/empathy.schemas.in index 66de66d62..e58bad7cd 100644 --- a/libempathy-gtk/empathy.schemas.in +++ b/data/empathy.schemas.in @@ -65,7 +65,7 @@ <applyto>/apps/empathy/ui/main_window_hidden</applyto> <owner>empathy</owner> <type>bool</type> - <default>false</default> + <default>true</default> <locale name="C"> <short>Hide main window</short> <long> diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index f2cf7ea68..1810fc4cf 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -52,28 +52,8 @@ dtd_DATA = \ gossip-status-presets.dtd \ gossip-contact-groups.dtd -schemasdir = $(GCONF_SCHEMA_FILE_DIR) -schemas_in_files = empathy.schemas.in -schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) -@INTLTOOL_SCHEMAS_RULE@ - -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 $(srcdir)/$$p ; \ - done \ - fi -else -install-data-local: -endif EXTRA_DIST = \ $(glade_DATA) \ - $(dtd_DATA) \ - $(schemas_in_files) \ - $(schemas_DATA) - -DISTCLEANFILES = \ - $(schemas_DATA) + $(dtd_DATA) |