diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-05-14 21:58:08 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-05-14 21:58:08 -0400 |
| commit | 2ed13de1533a1fafaac97be0fdc4154eb84ac35c (patch) | |
| tree | 98d1f9d19848ef3151fab5963fc8539a07ae3252 /m4macros | |
| parent | 763c1dab1f2c92526330425d77211b704668a3a3 (diff) | |
| download | glib-2ed13de1533a1fafaac97be0fdc4154eb84ac35c.tar.gz | |
Fix issues with GSETTINGS_CHECK_RULE
Rename the --schema-files option to --schema-file, since it only
accepts one file at a time. Change the GSETTINGS_CHECK_RULE to
use it that way, too. And also make it work better with !srcdir
builds.
Bugs #616731 and #616864
Diffstat (limited to 'm4macros')
| -rw-r--r-- | m4macros/gsettings.m4 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/m4macros/gsettings.m4 b/m4macros/gsettings.m4 index 78a20d3dd..12760eebf 100644 --- a/m4macros/gsettings.m4 +++ b/m4macros/gsettings.m4 @@ -25,11 +25,10 @@ AC_DEFUN([GLIB_GSETTINGS], GSETTINGS_CHECK_RULE=' .PHONY : check-gsettings-schema -gschema_xml_files := $(wildcard $(srcdir)/*.gschema.xml) check-gsettings-schema: gsettings_schema_validate_stamp MOSTLYCLEANFILES += gsettings_schema_validate_stamp -gsettings_schema_validate_stamp: $(gschema_xml_files) - $(GLIB_COMPILE_SCHEMAS) --dry-run --schema-files $? +gsettings_schema_validate_stamp: *.gschema.xml + $(GLIB_COMPILE_SCHEMAS) --dry-run $(addprefix --schema-files=,$?) touch [$]@ all: check-gsettings-schema |