[Buildroot] [PATCH 21/23 v5] docs/asciidoc: make it possible to use $(@D) in hooks
Yann E. MORIN
yann.morin.1998 at free.fr
Sun Sep 14 11:07:55 UTC 2014
Currently, it is not possible to use $(@D) in documents' hooks, because
there is no actual target file for the copying rule.
So, use the same mechanism as for generic-package.
We do not touch the target file, so it is easy to regenerate the manual
without calling the -clean rule first.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
---
docs/manual/manual.mk | 2 +-
package/doc-asciidoc.mk | 10 ++++------
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk
index b221664..9a86113 100644
--- a/docs/manual/manual.mk
+++ b/docs/manual/manual.mk
@@ -8,7 +8,7 @@ MANUAL_RESSOURCES = $(TOPDIR)/docs/images
# Our manual needs to generate lists
define MANUAL_GEN_LISTS
$(Q)$(call MESSAGE,"Updating the manual lists...")
- $(Q)BR2_DEFCONFIG="" TOPDIR=$(TOPDIR) O=$(BUILD_DIR)/$(pkgname) \
+ $(Q)BR2_DEFCONFIG="" TOPDIR=$(TOPDIR) O=$(@D) \
BR2_EXTERNAL=$(TOPDIR)/support/dummy-external \
python -B $(TOPDIR)/support/scripts/gen-manual-lists.py
endef
diff --git a/package/doc-asciidoc.mk b/package/doc-asciidoc.mk
index 38c9ced..13e4479 100644
--- a/package/doc-asciidoc.mk
+++ b/package/doc-asciidoc.mk
@@ -118,16 +118,14 @@ define ASCIIDOC
$(pkgname)-check-dependencies: asciidoc-check-dependencies
$$(Q)$$(foreach hook,$$($(2)_CHECK_EXTRA_DEPENDENCIES_HOOKS),$$(call $$(hook))$$(sep))
-$$(BUILD_DIR)/$(1):
- $$(Q)mkdir -p $$@
-
# Single line, because splitting a foreach is not easy...
-$(1)-rsync: $$(BUILD_DIR)/$(1)
+$$(BUILD_DIR)/$(1)/.stamp_doc_rsynced:
$$(Q)$$(call MESSAGE,"Preparing the $(1) sources...")
- $$(Q)rsync -a $(3) $$^
+ $$(Q)mkdir -p $$(@D)
+ $$(Q)rsync -a $(3) $$(@D)
$$(Q)$$(foreach hook,$$($(2)_POST_EXTRACT_HOOKS),$$(call $$(hook))$$(sep))
-$(1)-prepare-sources: $(1)-rsync
+$(1)-prepare-sources: $$(BUILD_DIR)/$(1)/.stamp_doc_rsynced
$(call ASCIIDOC_INNER,$(1),$(2),$(3),xhtml,html,html,HTML,\
--xsltproc-opts "--stringparam toc.section.depth 1")
--
1.9.1
More information about the buildroot
mailing list