diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2010-10-04 01:51:11 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2010-10-04 01:51:11 -0400 |
| commit | 136e705e8383ff8848e425ac01278102d7badc52 (patch) | |
| tree | 31a2d161b44c9b60ea439e5e537992a28af5a5e2 /m4macros | |
| parent | 8efcc0d8c86b588eb0ee0e60d3c60d8c107734b5 (diff) | |
| download | glib-136e705e8383ff8848e425ac01278102d7badc52.tar.gz | |
Bug 627126 - gsettings schemas on FreeBSD
Rewrite the install rule for GSettings schemas to not depend on an
obscure chunk of non-portable sed that nobody understands the purpose
of.
Instead, use make's VPATH feature to resolve the paths of the files that
need to be installed. No need to depend on the .valid targets here
since automake already ensures that 'make all' is complete before 'make
install' is permitted to run.
Diffstat (limited to 'm4macros')
| -rw-r--r-- | m4macros/gsettings.m4 | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/m4macros/gsettings.m4 b/m4macros/gsettings.m4 index ac9945e9d..e81a51241 100644 --- a/m4macros/gsettings.m4 +++ b/m4macros/gsettings.m4 @@ -45,22 +45,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) $(gsettings__enum_file) +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) @$(NORMAL_INSTALL) test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)" - @list='\''$(gsettings__enum_file) $(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: |