luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gsettings.m4: @GSETTINGS_RULES@: Support srcdir != builddir with nonrecursive make

Browse Source 
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
This commit is contained in:
Colin Walters 2013-11-12 13:41:47 -05:00
parent f79e39154d
commit 3c2d52cc96
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
m4macros/gsettings.m4
View File

@ -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