pidgin: 0b65ec96: Fix installing GConf schema. GCONF_SCHEM...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 0b65ec96737b816ebd6719a2f67bbbb8b77e65e9
Ancestor: 7072aab86b390122c32faa675284a753c9e97034
Author: nosnilmot at pidgin.im
Date: 2010-05-13T13:28:12
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0b65ec96737b816ebd6719a2f67bbbb8b77e65e9

Modified files:
        libpurple/gconf/Makefile.am

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/gconf/Makefile.am	24b7e421e1efedbfec9b290367e2449fc25e0a10
+++ libpurple/gconf/Makefile.am	2a7282e1709abab7e6554e7c9633b8099f7f3f0d
@@ -2,17 +2,17 @@ EXTRA_DIST = purple.schemas.in
 
 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