[telepathy-account-widgets] data/Makefile.am: make --disable-settings actually work
- From: Marco Barisione <mbari src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [telepathy-account-widgets] data/Makefile.am: make --disable-settings actually work
- Date: Wed, 28 Aug 2013 16:31:09 +0000 (UTC)
commit c7c5ffe921566ca7f502ba96913d5c0ebadc14a9
Author: Marco Barisione <marco barisione collabora co uk>
Date: Wed Aug 28 17:07:34 2013 +0100
data/Makefile.am: make --disable-settings actually work
Even if ENABLE_SETTINGS was not set, the files were still installed as
@GSETTINGS_RULES@ was still expanded.
https://bugzilla.gnome.org/show_bug.cgi?id=706801
data/Makefile.am | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 433fb18..037672c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,8 +1,13 @@
SUBDIRS = icons
-gsettings_SCHEMAS = org.gnome.telepathy-account-widgets.gschema.xml
+gsettings_SCHEMAS_real = org.gnome.telepathy-account-widgets.gschema.xml
if ENABLE_SETTINGS
+gsettings_SCHEMAS = $(gsettings_SCHEMAS_real)
+else
+gsettings_SCHEMAS =
+endif
+
@GSETTINGS_RULES@
# We need to compile schemas at make time
@@ -10,12 +15,13 @@ if ENABLE_SETTINGS
gschemas.compiled: $(gsettings_SCHEMAS:.xml=.valid)
$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --targetdir=. .
+if ENABLE_SETTINGS
all-local: gschemas.compiled
endif
EXTRA_DIST = \
$(schemas_DATA) \
- $(gsettings_SCHEMAS) \
+ $(gsettings_SCHEMAS_real) \
$(NULL)
DISTCLEANFILES = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]