changeset
Fix installing GConf schema. GCONF_SCHEMAS_INSTALL does not refer to
Thu, 13 May 2010 13:28:12 +0000
- author
- Stu Tomlinson <nosnilmot@pidgin.im>
- date
- Thu, 13 May 2010 13:28:12 +0000
- changeset 30247
- 776d3ed6484d
- parent 30245
- 7e118b346ddc
- child 30248
- eb5d36a2480b
Fix installing GConf schema. GCONF_SCHEMAS_INSTALL does not refer to
whether the file should be installed on the filesystem or not. This is
still broken for people who disable i18n but no more than before.
| libpurple/gconf/Makefile.am | file | annotate | diff | comparison | revisions |
--- a/libpurple/gconf/Makefile.am Thu May 13 05:11:00 2010 +0000 +++ b/libpurple/gconf/Makefile.am Thu May 13 13:28:12 2010 +0000 @@ -2,17 +2,17 @@ EXTRA_DIST = purple.schemas.in -if GCONF_SCHEMAS_INSTALL - if INSTALL_I18N schema_in_files = purple.schemas.in schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ -endif #INSTALL_I18N +if GCONF_SCHEMAS_INSTALL install-data-local: GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 | \ grep -v "^WARNING: failed to install schema" | grep -v "^Attached schema" 1>&2 else install-data-local: endif #GCONF_SCHEMAS_INSTALL + +endif #INSTALL_I18N
