From d445cc2ace4729dd70bf25628aceb119415dffdf Mon Sep 17 00:00:00 2001 From: Marco Barisione Date: Tue, 27 Aug 2013 07:49:12 +0100 Subject: build: add --disable-settings to avoid installing the GSettings schema This is needed to avoid multiple components shipping the same schema. It's just a temporary workaround that won't be needed when https://bugzilla.gnome.org/show_bug.cgi?id=706317 will be fixed. https://bugzilla.gnome.org/show_bug.cgi?id=706801 --- data/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 19f40a3b..433fb18b 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,6 +1,8 @@ SUBDIRS = icons gsettings_SCHEMAS = org.gnome.telepathy-account-widgets.gschema.xml + +if ENABLE_SETTINGS @GSETTINGS_RULES@ # We need to compile schemas at make time @@ -9,6 +11,7 @@ gschemas.compiled: $(gsettings_SCHEMAS:.xml=.valid) $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --targetdir=. . all-local: gschemas.compiled +endif EXTRA_DIST = \ $(schemas_DATA) \ -- cgit v1.2.1