diff options
| author | Atul Singh <atul.singh.mandla@rockwellcollins.com> | 2016-07-27 13:02:48 -0500 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-07-27 21:26:39 +0200 |
| commit | 9d4a1a78d11f823336b74835ec6b02c1505502b6 (patch) | |
| tree | af8a17a9ebd72d9917f0223a945f7d6e4e744217 /package/doc-asciidoc.mk | |
| parent | 7800ae9f6a5735909956ac20c82d2c99ccb68761 (diff) | |
asciidoc: use absolute path for resources
One of the "features" of a2x is that the '-r|--resource' flag imports
resources relative to the [SOURCE_FILE], not the CWD. The current
implementation tries to import resources from the destination dir $(@D),
which works fine for out-of-tree builds because $(@D) is an absolute
path, however in-tree builds treat $(@D) as a relative path, which breaks
because a2x treats $(@D) relative to SOURCE_FILE.
Use the make command $(abspath names...) to convert the dest dir to an
absolute path before passing it as a resource.
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Brandon Maier <brandon.maier@rockwellcollins.com>
Signed-off-by: Atul Singh Mandla <atul.singh.mandla@rockwellcollins.com>
Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/doc-asciidoc.mk')
| -rw-r--r-- | package/doc-asciidoc.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/package/doc-asciidoc.mk b/package/doc-asciidoc.mk index 6ab5ad27e..4f765b885 100644 --- a/package/doc-asciidoc.mk +++ b/package/doc-asciidoc.mk @@ -117,7 +117,8 @@ $$(O)/docs/$(1)/$(1).$(6): $$($(2)_SOURCES) \ $$(Q)$$(call MESSAGE,"Generating $(7) $(1)...") $$(Q)mkdir -p $$(@D) $$(Q)a2x $(8) -f $(4) -d book -L \ - $$(foreach r,$$($(2)_RESOURCES),-r $$(r)) -r $$(@D) \ + $$(foreach r,$$($(2)_RESOURCES) $$(@D), \ + --resource="$$(abspath $$(r))") \ $$($(2)_$(4)_A2X_OPTS) \ --asciidoc-opts="$$($(2)_$(4)_ASCIIDOC_OPTS)" \ $$(BUILD_DIR)/docs/$(1)/$(1).txt |