NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/doc-asciidoc.mk: unbreak docs logic after pkgdir change

Browse Source 
Commit 748fc4be21 (package/pkg-utils.mk: remove trailing slash in pkgdir
definition) broke the docs generation logic:

make manual-html
>>>   Preparing the manual sources...
>>>   Generating HTML manual...
a2x: ERROR: missing ASCIIDOC_FILE: /home/peko/source/buildroot/output/build/docs/manual/manual.adoc

make: *** [docs/manual/manual.mk:12: /home/peko/source/buildroot/output/docs/manual/manual.html] Error 1

As it now ends up with the .adoc file one level below
(../docs/manual/manual/manual.adoc).  The reason is that the pkgdir macro is
used to define $(2)_DOCDIR, which is passed to rsync:

rsync -a docs/manual /home/peko/source/buildroot/output/build/docs/manual

Fix it by appending a / to the rsync arguments like we do elsewhere.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
This commit is contained in:
Peter Korsgaard 2024-03-25 07:48:13 +01:00 committed by Arnout Vandecappelle
parent f98239dada
commit bb4371d086
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/doc-asciidoc.mk
View File

@ -155,7 +155,7 @@ $(1)-check-dependencies: asciidoc-check-dependencies $$($(2)_DEPENDENCIES)
$$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced:
$$(Q)$$(call MESSAGE,"Preparing the $(1) sources...")
$$(Q)mkdir -p $$(@D)
$$(Q)rsync -a $$($(2)_DOCDIR) $$(@D)
$$(Q)rsync -a $$($(2)_DOCDIR)/ $$(@D)/
$$(Q)$$(foreach hook,$$($(2)_POST_RSYNC_HOOKS),$$(call $$(hook))$$(sep))
.PHONY: $(1)-prepare-sources