diff options
| author | Stu Tomlinson <nosnilmot@pidgin.im> | 2010-05-13 13:28:12 +0000 |
|---|---|---|
| committer | Stu Tomlinson <nosnilmot@pidgin.im> | 2010-05-13 13:28:12 +0000 |
| commit | 0e34eb76ffc77248d9a0abe89afedfe554a9f0b4 (patch) | |
| tree | 6a27c235d2c378f9daad8ac61cce13f07490deb7 | |
| parent | 855f718252b0b079cf19d04283f4d0474e62504a (diff) | |
| download | pidgin-0e34eb76ffc77248d9a0abe89afedfe554a9f0b4.tar.gz | |
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.
| -rw-r--r-- | libpurple/gconf/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpurple/gconf/Makefile.am b/libpurple/gconf/Makefile.am index 9c422d513c..ff3b98b5c9 100644 --- a/libpurple/gconf/Makefile.am +++ b/libpurple/gconf/Makefile.am @@ -2,17 +2,17 @@ schemadir = @GCONF_SCHEMA_FILE_DIR@ 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 |