diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2010-06-28 14:06:32 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2010-06-28 14:06:32 -0400 |
| commit | 8a7d9906983c23c9bafa8b10c1fd089fcd7989f8 (patch) | |
| tree | 5e5955a65b5870c9f8d09d33d524f2084fd43853 /m4macros | |
| parent | ab1111b8bbb7a6057248658013eb23d80f4721cf (diff) | |
| download | glib-8a7d9906983c23c9bafa8b10c1fd089fcd7989f8.tar.gz | |
Bug 622565 - compile-schemas fails when no schemas
Neutralise and deprecate the --uninstall option in the schema compiler
and remove it from gsettings.m4.
Make the new default behaviour a compromise between the old default
behaviour and the previous --uninstall option:
- never return a failure code if no schema files are found
- issue a warning instead
- remove the gschemas.compiled file if it exists
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 ee97b5732..58a826d93 100644 --- a/m4macros/gsettings.m4 +++ b/m4macros/gsettings.m4 @@ -68,7 +68,7 @@ uninstall-gsettings-schemas: test -n "$$files" || exit 0; \ echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) --uninstall $(gsettingsschemadir) + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) clean-gsettings-schemas: rm -f $(gsettings_SCHEMAS:.xml=.valid) |