aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@openbsd.org>2011-09-18 18:11:06 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-09-19 17:12:04 +0800
commite832dfa825bd284600ffa28d2a9180d96c7024a5 (patch)
tree39613dfe166b663e5e86baefe740d914372811e1
parent8a15d7ddcab9c2379e562e3b72e8ec6b11165d25 (diff)
downloadgsoc2013-empathy-e832dfa825bd284600ffa28d2a9180d96c7024a5.tar
gsoc2013-empathy-e832dfa825bd284600ffa28d2a9180d96c7024a5.tar.gz
gsoc2013-empathy-e832dfa825bd284600ffa28d2a9180d96c7024a5.tar.bz2
gsoc2013-empathy-e832dfa825bd284600ffa28d2a9180d96c7024a5.tar.lz
gsoc2013-empathy-e832dfa825bd284600ffa28d2a9180d96c7024a5.tar.xz
gsoc2013-empathy-e832dfa825bd284600ffa28d2a9180d96c7024a5.tar.zst
gsoc2013-empathy-e832dfa825bd284600ffa28d2a9180d96c7024a5.zip
Sync with the current GSettings schemas install rule from gsettings.m4 in glib. See #627126 for details.
This allows to properly install gsettings schemas files on BSDs. https://bugzilla.gnome.org/show_bug.cgi?id=659377
-rw-r--r--m4/gsettings.m416
1 files changed, 2 insertions, 14 deletions
diff --git a/m4/gsettings.m4 b/m4/gsettings.m4
index b68698980..76b808ae6 100644
--- a/m4/gsettings.m4
+++ b/m4/gsettings.m4
@@ -36,22 +36,10 @@ install-data-am: install-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)"
- @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: