mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-11 15:06:14 +01:00
Revert "gsettings m4: check for .xml in src/builddir"
This reverts commit b3593693d9
.
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
This commit is contained in:
parent
ee5dab6bb5
commit
d7f885b1f3
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user