From 8a7d9906983c23c9bafa8b10c1fd089fcd7989f8 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Mon, 28 Jun 2010 14:06:32 -0400 Subject: 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 --- m4macros/gsettings.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'm4macros') 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) -- cgit v1.2.3