[empathy] Sync with the current GSettings schemas install rule from gsettings.m4 in glib. See #627126 for deta
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Sync with the current GSettings schemas install rule from gsettings.m4 in glib. See #627126 for deta
- Date: Mon, 19 Sep 2011 09:12:29 +0000 (UTC)
commit e832dfa825bd284600ffa28d2a9180d96c7024a5
Author: Antoine Jacoutot <ajacoutot openbsd org>
Date: Sun Sep 18 12:11:06 2011 +0200
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
m4/gsettings.m4 | 16 ++--------------
1 files changed, 2 insertions(+), 14 deletions(-)
---
diff --git a/m4/gsettings.m4 b/m4/gsettings.m4
index b686989..76b808a 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:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]