diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2010-05-27 11:58:54 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2010-05-27 11:58:54 -0400 |
| commit | b3593693d918f0ae97094f6712d817180b8eea6a (patch) | |
| tree | 9186dc456e6efa5cf3a3cfa3f523cc93758a6bbb /m4macros | |
| parent | e7927faf1792ad4c3c8a5b599240a7ee94b1a0cc (diff) | |
| download | glib-b3593693d918f0ae97094f6712d817180b8eea6a.tar.gz glib-b3593693d918f0ae97094f6712d817180b8eea6a.tar.bz2 glib-b3593693d918f0ae97094f6712d817180b8eea6a.zip | |
gsettings m4: check for .xml in src/builddir
This checks for the .gschema.xml file in the srcdir and builddir and
runs the schema validation on which one it finds. This handles
non-srcdir builds in both cases: .gschema.xml is in the tarball and
.gschema.xml is generated.
Diffstat (limited to 'm4macros')
| -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 329700d02..b68698980 100644 --- a/m4macros/gsettings.m4 +++ b/m4macros/gsettings.m4 @@ -28,7 +28,7 @@ AC_DEFUN([GLIB_GSETTINGS], mostlyclean-am: clean-gsettings-schemas %.gschema.valid: %.gschema.xml - $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --dry-run --schema-file=$^ && touch [$]@ + $(AM_V_GEN) if test -f "$^"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --dry-run --schema-file=$${d}$^ && touch [$]@ all-am: $(gsettings_SCHEMAS:.xml=.valid) uninstall-am: uninstall-gsettings-schemas |