From 9d4a1a78d11f823336b74835ec6b02c1505502b6 Mon Sep 17 00:00:00 2001 From: Atul Singh Date: Wed, 27 Jul 2016 13:02:48 -0500 Subject: [PATCH] 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" Signed-off-by: Brandon Maier Signed-off-by: Atul Singh Mandla Signed-off-by: Matt Weber Signed-off-by: Peter Korsgaard --- package/doc-asciidoc.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/doc-asciidoc.mk b/package/doc-asciidoc.mk index 6ab5ad27e4..4f765b8856 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 -- 2.30.2