[glib] gsettings.m4: @GSETTINGS_RULES@: Support srcdir != builddir with nonrecursive make
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] gsettings.m4: @GSETTINGS_RULES@: Support srcdir != builddir with nonrecursive make
- Date: Mon, 18 Nov 2013 19:19:33 +0000 (UTC)
commit 3c2d52cc965ac6c4d44f3812cb3d52631873ff02
Author: Colin Walters <walters verbum org>
Date: Tue Nov 12 13:41:47 2013 -0500
gsettings.m4: @GSETTINGS_RULES@: Support srcdir != builddir with nonrecursive make
In hotssh I use nonrecursive make. gnome-continuous uses srcdir !=
builddir by default. @GSETTINGS_RULES@ will then attempt to touch a
nonexistent path.
This patch fixes that.
https://bugzilla.gnome.org/show_bug.cgi?id=712171
m4macros/gsettings.m4 | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/m4macros/gsettings.m4 b/m4macros/gsettings.m4
index 7b2f9a2..1a19c39 100644
--- a/m4macros/gsettings.m4
+++ b/m4macros/gsettings.m4
@@ -37,7 +37,7 @@ mostlyclean-am: clean-gsettings-schemas
gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
- $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict
--dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@
+ $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict
--dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && mkdir -p [$](@D) &&
touch [$]@
all-am: $(gsettings_SCHEMAS:.xml=.valid)
uninstall-am: uninstall-gsettings-schemas
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]