From: Colin Walters Date: Mon, 18 Nov 2013 19:28:15 +0000 (-0500) Subject: Revert "gsettings m4: check for .xml in src/builddir" X-Git-Tag: 2.39.3~111 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7f885b1f3fcd863dd2e48a12932a609d783ac10;p=platform%2Fupstream%2Fglib.git 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 --- 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