summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley2006-03-13 02:52:23 +0000
committerRob Landley2006-03-13 02:52:23 +0000
commit9dc6913896d3b5f7bb339731c042372601cc755b (patch)
tree4126a1c4c4c5297909f1f15c2b2c6c53b8b02ccf
parente01d746fe962e1c3de57f8b909abc9801ecceff1 (diff)
downloadbusybox-9dc6913896d3b5f7bb339731c042372601cc755b.zip
busybox-9dc6913896d3b5f7bb339731c042372601cc755b.tar.gz
Fix "rm .config;make menuconfig" to work like "rm .config; make" (I.E. do
defconfig first), and group busybox administrative settings into a sub-menu.
-rw-r--r--Config.in4
-rw-r--r--Makefile3
2 files changed, 5 insertions, 2 deletions
diff --git a/Config.in b/Config.in
index 6c9e0c5..33f6d9a 100644
--- a/Config.in
+++ b/Config.in
@@ -9,7 +9,7 @@ config HAVE_DOT_CONFIG
bool
default y
-comment "Busybox Settings"
+menu "Busybox Settings"
menu "General Configuration"
@@ -384,6 +384,8 @@ endmenu
source libbb/Config.in
+endmenu
+
comment "Applets"
source archival/Config.in
diff --git a/Makefile b/Makefile
index f255394..64293b8 100644
--- a/Makefile
+++ b/Makefile
@@ -162,7 +162,7 @@ help:
ifneq ($(strip $(HAVE_DOT_CONFIG)),y)
# Default target if none was requested explicitly
-all: defconfig menuconfig ;
+all: menuconfig ;
ifneq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
# warn if no configuration exists and we are asked to build a non-config target
@@ -191,6 +191,7 @@ scripts/config/mconf: scripts/config/Makefile
$(Q)$(MAKE) -C scripts/config ncurses conf mconf
menuconfig: scripts/config/mconf
+ @[ -f .config ] || make $(MAKEFLAGS) defconfig
@./scripts/config/mconf $(CONFIG_CONFIG_IN)
config: scripts/config/conf