[glib] Revert "gsettings m4: check for .xml in src/builddir"
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Revert "gsettings m4: check for .xml in src/builddir"
- Date: Mon, 23 Dec 2013 16:28:41 +0000 (UTC)
commit d7f885b1f3fcd863dd2e48a12932a609d783ac10
Author: Colin Walters <walters verbum org>
Date: Mon Nov 18 14:28:15 2013 -0500
Revert "gsettings m4: check for .xml in src/builddir"
This reverts commit b3593693d918f0ae97094f6712d817180b8eea6a.
See: https://bugzilla.gnome.org/show_bug.cgi?id=712171#c3
See: https://bugzilla.gnome.org/show_bug.cgi?id=712171#c4
Tested using both srcdir == builddir and srcdir != builddir in hotssh.
Conflicts:
m4macros/gsettings.m4
https://bugzilla.gnome.org/show_bug.cgi?id=712630
m4macros/gsettings.m4 | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/m4macros/gsettings.m4 b/m4macros/gsettings.m4
index 1a19c39..35ee5aa 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}$< && mkdir -p [$](@D) &&
touch [$]@
+ $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix
--schema-file=,$(gsettings__enum_file)) --schema-file=$< && 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]