diff options
| author | Shaun McCance <shaunm@src.gnome.org> | 2007-02-19 20:16:00 +0000 |
|---|---|---|
| committer | Shaun McCance <shaunm@src.gnome.org> | 2007-02-19 20:16:00 +0000 |
| commit | d2500da730cd20968b48124fde90d7eb0ba63950 (patch) | |
| tree | c8b38b3dd066ada484a6e728f3bcc2d803d95e6f | |
| parent | f99737c797c6d5c3b59983555a7ff0d7f42e25d7 (diff) | |
| download | gnome-doc-utils-d2500da730cd20968b48124fde90d7eb0ba63950.tar.gz | |
- Use abs_srcdir to remove some relative path stupidity [#409341]
* tools/gnome-doc-utils.make:
- Use abs_srcdir to remove some relative path stupidity [#409341]
svn path=/trunk/; revision=884
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | tools/gnome-doc-utils.make | 13 |
2 files changed, 10 insertions, 8 deletions
@@ -1,5 +1,10 @@ 2007-02-19 Shaun McCance <shaunm@gnome.org> + * tools/gnome-doc-utils.make: + - Use abs_srcdir to remove some relative path stupidity [#409341] + +2007-02-19 Shaun McCance <shaunm@gnome.org> + * xslt/docbook/omf/db2omf.xsl: - Fixed type in error message diff --git a/tools/gnome-doc-utils.make b/tools/gnome-doc-utils.make index c1964ab..5a23229 100644 --- a/tools/gnome-doc-utils.make +++ b/tools/gnome-doc-utils.make @@ -116,6 +116,8 @@ _DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \ $(filter $(LINGUAS),$(DOC_LINGUAS)), \ $(DOC_LINGUAS)) +_DOC_ABS_SRCDIR = @abs_srcdir@ + ################################################################################ ## Variables for Bootstrapping @@ -151,7 +153,7 @@ db2omf_args = \ ## @ _DOC_OMF_IN ## The OMF input file -_DOC_OMF_IN = $(if $(DOC_MODULE),$(abspath $(wildcard $(srcdir)/$(DOC_MODULE).omf.in))) +_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in)) ## @ _DOC_OMF_DB ## The OMF files for DocBook output @@ -287,11 +289,7 @@ $(_DOC_POFILES): fi; @docs=; \ list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \ - if test -f $$doc; then \ - docs="$$docs ../$$doc"; \ - else \ - docs="$$docs ../$(srcdir)/$$doc"; \ - fi; \ + docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \ done; \ if ! test -f $@; then \ echo "(cd $(dir $@) && \ @@ -312,8 +310,7 @@ $(_DOC_POFILES): $(_DOC_LC_DOCS) : $(_DOC_POFILES) $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) if ! test -d $(dir $@); then mkdir $(dir $@); fi - case "$(srcdir)" in /*) sd="$(srcdir)";; *) sd="../$(srcdir)";; esac; \ - if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$$sd/"; fi; \ + if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ (cd $(dir $@) && \ $(_xml2po) -e -p \ "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \ |