[Buildroot] [PATCH 17/18 v4] Makefile: move manual inclusion
Yann E. MORIN
yann.morin.1998 at free.fr
Sun Sep 7 23:39:16 UTC 2014
Move inclusion of the manual before that of br2-external, so that it is
possible to use the GENDOC infrastructure from br2-external.
We can no longer use $(pkgname) in our manual post-extract hook, because
it might no longer be the last file sourced, since br2-external can
include files after us.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
Cc: Samuel Martin <s.martin49 at gmail.com>
Cc: Thomas De Schampheleire <patrickdepinguin at gmail.com>
---
Note: I'm not too fond of this, but $(@D) does not work here. Any idea?
---
Makefile | 4 ++--
docs/manual/manual.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index e788f1b..7a11e9e 100644
--- a/Makefile
+++ b/Makefile
@@ -388,6 +388,8 @@ include linux/linux.mk
include system/system.mk
include fs/common.mk
+include docs/manual/manual.mk
+
include $(BR2_EXTERNAL)/external.mk
TARGETS_SOURCE := $(patsubst %,%-source,$(TARGETS))
@@ -931,6 +933,4 @@ release:
print-version:
@echo $(BR2_VERSION_FULL)
-include docs/manual/manual.mk
-
.PHONY: $(noconfig_targets)
diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk
index 373c382..d0f38ac 100644
--- a/docs/manual/manual.mk
+++ b/docs/manual/manual.mk
@@ -156,7 +156,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=$(BUILD_DIR)/manual \
BR2_EXTERNAL=$(TOPDIR)/support/dummy-external \
python -B $(TOPDIR)/support/scripts/gen-manual-lists.py
endef
--
1.9.1
More information about the buildroot
mailing list