svn commit: trunk/busybox

landley at busybox.net landley at busybox.net
Mon Mar 13 02:52:25 UTC 2006


Author: landley
Date: 2006-03-12 18:52:23 -0800 (Sun, 12 Mar 2006)
New Revision: 14527

Log:
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.


Modified:
   trunk/busybox/Config.in
   trunk/busybox/Makefile


Changeset:
Modified: trunk/busybox/Config.in
===================================================================
--- trunk/busybox/Config.in	2006-03-12 19:26:01 UTC (rev 14526)
+++ trunk/busybox/Config.in	2006-03-13 02:52:23 UTC (rev 14527)
@@ -9,7 +9,7 @@
 	bool
 	default y
 
-comment "Busybox Settings"
+menu "Busybox Settings"
 
 menu "General Configuration"
 
@@ -384,6 +384,8 @@
 
 source libbb/Config.in
 
+endmenu
+
 comment "Applets"
 
 source archival/Config.in

Modified: trunk/busybox/Makefile
===================================================================
--- trunk/busybox/Makefile	2006-03-12 19:26:01 UTC (rev 14526)
+++ trunk/busybox/Makefile	2006-03-13 02:52:23 UTC (rev 14527)
@@ -162,7 +162,7 @@
 
 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 @@
 	$(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




More information about the busybox-cvs mailing list