diff options
| author | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-08-28 17:07:34 +0100 |
|---|---|---|
| committer | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-08-28 17:07:34 +0100 |
| commit | c7c5ffe921566ca7f502ba96913d5c0ebadc14a9 (patch) | |
| tree | b17a8325e4ad2de86964415ca46f741e40f0a084 | |
| parent | 6eb668e501d8307859f44d0ba8ea8e172952fdc5 (diff) | |
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
| -rw-r--r-- | data/Makefile.am | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 433fb18b..037672c5 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 = \ |