svn commit: trunk/busybox

[landley at busybox.net]

Author: landley
Date: 2006-02-27 21:26:13 -0800 (Mon, 27 Feb 2006)
New Revision: 14347

Log:
defconfig shouldn't enable CONFIG_INSTALL_NO_USR, and while we're at it
remove residue of old defconfig and tweak "make with no config" to run
defconfig before bringing up menuconfig.


Modified:
   trunk/busybox/Makefile


Changeset:
Modified: trunk/busybox/Makefile
===================================================================
--- trunk/busybox/Makefile	2006-02-28 05:07:08 UTC (rev 14346)
+++ trunk/busybox/Makefile	2006-02-28 05:26:13 UTC (rev 14347)
@@ -37,7 +37,6 @@
 _all:
 
 CONFIG_CONFIG_IN = $(top_srcdir)/Config.in
-CONFIG_DEFCONFIG = $(top_srcdir)/defconfig
 
 ifeq ($(KBUILD_SRC),)
 
@@ -145,7 +144,7 @@
 ifneq ($(strip $(HAVE_DOT_CONFIG)),y)
 
 # Default target if none was requested explicitly
-all: menuconfig
+all: defconfig menuconfig
 
 # warn if no configuration exists and we are asked to build a non-config target
 .config:
@@ -161,13 +160,13 @@
 scripts/config/conf: scripts/config/Makefile
 	$(Q)$(MAKE) -C scripts/config conf
 	- at if [ ! -f .config ] ; then \
-		cp $(CONFIG_DEFCONFIG) .config; \
+		touch .config; \
 	fi
 
 scripts/config/mconf: scripts/config/Makefile
 	$(Q)$(MAKE) -C scripts/config ncurses conf mconf
 	- at if [ ! -f .config ] ; then \
-		cp $(CONFIG_DEFCONFIG) .config; \
+		touch .config; \
 	fi
 
 menuconfig: scripts/config/mconf
@@ -196,7 +195,7 @@
 
 defconfig: scripts/config/conf
 	@./scripts/config/conf -y $(CONFIG_CONFIG_IN)
-	sed -i -r -e "s/^(USING_CROSS_COMPILER|CONFIG_(DEBUG.*|STATIC|SELINUX|BUILD_(AT_ONCE|LIBBUSYBOX)|FEATURE_(DEVFS|FULL_LIBBUSYBOX|SHARED_BUSYBOX|MTAB_SUPPORT|CLEAN_UP|UDHCP_DEBUG)))=.*/# \1 is not set/" .config
+	sed -i -r -e "s/^(USING_CROSS_COMPILER|CONFIG_(DEBUG.*|STATIC|SELINUX|BUILD_(AT_ONCE|LIBBUSYBOX)|FEATURE_(DEVFS|FULL_LIBBUSYBOX|SHARED_BUSYBOX|MTAB_SUPPORT|CLEAN_UP|UDHCP_DEBUG)|INSTALL_NO_USR))=.*/# \1 is not set/" .config
 	@./scripts/config/conf -o $(CONFIG_CONFIG_IN)