From a49b81ed69e3da1f7854efcab8133081ee367556 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 16 Apr 2016 23:20:17 +0200 Subject: [PATCH] Revert "core: also display the custom help with our main help" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit 0a767deba004c920e7824543380cffbb298507f8. Turns out that the custom help is not available when the $(O) directory has not been configure yet (i.e. when there is no .config already filled). Rather than trying to work around this limitation with dirty hacks, just revert this feature. After all, this will not prevent an external.mk from providing custom help anyway; it's just not gonna be advertised nor displayed with the main help. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Peter Korsgaard Cc: Jérôme Pouiller Signed-off-by: Peter Korsgaard --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 55735ea735..d205ac9eb3 100644 --- a/Makefile +++ b/Makefile @@ -895,9 +895,7 @@ endif rm -rf $(BR2_CONFIG) $(CONFIG_DIR)/.config.old $(CONFIG_DIR)/..config.tmp \ $(CONFIG_DIR)/.auto.deps $(BR2_EXTERNAL_FILE) -help: help-internal help-custom - -help-internal: +help: @echo 'Cleaning:' @echo ' clean - delete all files created by build' @echo ' distclean - delete all non-source files (including .config)' @@ -970,6 +968,7 @@ endif @echo ' source-check - check selected packages for valid download URLs' @echo ' external-deps - list external packages used' @echo ' legal-info - generate info about license compliance' + @echo ' help-custom - print help about custom actions (if any)' @echo @echo ' make V=0|1 - 0 => quiet build (default), 1 => verbose build' @echo ' make O=dir - Locate all output files in "dir", including .config' -- 2.30.2