[glib] gsettings m4: check for .xml in src/builddir
- From: Ryan Lortie <ryanl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] gsettings m4: check for .xml in src/builddir
- Date: Thu, 27 May 2010 16:02:28 +0000 (UTC)
commit b3593693d918f0ae97094f6712d817180b8eea6a
Author: Ryan Lortie <desrt desrt ca>
Date: Thu May 27 11:58:54 2010 -0400
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.
m4macros/gsettings.m4 | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/m4macros/gsettings.m4 b/m4macros/gsettings.m4
index 329700d..b686989 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]