diff options
| author | Colin Walters <walters@verbum.org> | 2013-11-12 13:41:47 -0500 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2013-11-18 14:19:19 -0500 |
| commit | 3c2d52cc965ac6c4d44f3812cb3d52631873ff02 (patch) | |
| tree | 8dd1846e8f0acdecc510b3b90622b69ce5e71ff9 | |
| parent | f79e39154d4028dac1366e813aba0cabdd48c9c2 (diff) | |
| download | glib-3c2d52cc965ac6c4d44f3812cb3d52631873ff02.tar.gz | |
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
| -rw-r--r-- | m4macros/gsettings.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/m4macros/gsettings.m4 b/m4macros/gsettings.m4 index 7b2f9a233..1a19c3975 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 |