doc/manual: fix generating manual after legacy overhaul
authorYann E. MORIN <yann.morin.1998@free.fr>
Fri, 1 May 2015 16:35:34 +0000 (18:35 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Sat, 2 May 2015 07:00:44 +0000 (09:00 +0200)
Commit 53903a15 (*config: improve handling of BR2_LEGACY) added an
option to entirely skip legacy entries, by passing a variable in the
environment.

However, it missed one location where that variable is also needed,
which is generating the list of packages and deprecated features for
inclusion in the manual.

Fix that by re-using the global $(COMMON_CONFIG_ENV) variable,
overriding just what we don't want (i.e. br2-external location and
defconfig path).

Also, slightly re-order variables so the ones we override come right
after the common settings, moving the specific ones at the end, one
variable per line.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
docs/manual/manual.mk

index d5db2c26c9fbb04dd1272859e0717ccbf8a4c337..ad9bd903cff4ea6270c38a7425c4866214d27c65 100644 (file)
@@ -12,8 +12,11 @@ MANUAL_RESOURCES = $(TOPDIR)/docs/images
 # should not be included in the manual.
 define MANUAL_GEN_LISTS
        $(Q)$(call MESSAGE,"Updating the manual lists...")
-       $(Q)BR2_DEFCONFIG="" TOPDIR=$(TOPDIR) O=$(@D) \
+       $(Q)$(COMMON_CONFIG_ENV) \
+               BR2_DEFCONFIG="" \
                BR2_EXTERNAL=$(TOPDIR)/support/dummy-external \
+               TOPDIR=$(TOPDIR) \
+               O=$(@D) \
                python -B $(TOPDIR)/support/scripts/gen-manual-lists.py
 endef
 MANUAL_POST_RSYNC_HOOKS += MANUAL_GEN_LISTS