Sync with the current GSettings schemas install rule from gsettings.m4 in glib. See...

[empathy.git] / m4 / gsettings.m4

diff --git a/m4/gsettings.m4 b/m4/gsettings.m4
index b68698980165bc9bc9aafcde5fe9d7de7ed01375..76b808ae6d90b92ffa46126aee851ae9892554cd 100644 (file)
--- a/m4/gsettings.m4
+++ b/m4/gsettings.m4
@@ -36,22 +36,10 @@ install-data-am: install-gsettings-schemas
 
 .SECONDARY: $(gsettings_SCHEMAS)
 
 
 .SECONDARY: $(gsettings_SCHEMAS)
 

-gsettings__base_list = \
-  sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
-  sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
-
-install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid)
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)

        @$(NORMAL_INSTALL)
        test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
        @$(NORMAL_INSTALL)
        test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"

-       @list='\''$(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(gsettings__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \
-       done
+       $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"

        test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
 
 uninstall-gsettings-schemas:
        test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
 
 uninstall-gsettings-schemas: