mirror of
https://github.com/topjohnwu/ndk-busybox.git
synced 2024-11-24 12:19:49 +00:00
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.
This commit is contained in:
parent
e01d746fe9
commit
9dc6913896
@ -9,7 +9,7 @@ config HAVE_DOT_CONFIG
|
|||||||
bool
|
bool
|
||||||
default y
|
default y
|
||||||
|
|
||||||
comment "Busybox Settings"
|
menu "Busybox Settings"
|
||||||
|
|
||||||
menu "General Configuration"
|
menu "General Configuration"
|
||||||
|
|
||||||
@ -384,6 +384,8 @@ endmenu
|
|||||||
|
|
||||||
source libbb/Config.in
|
source libbb/Config.in
|
||||||
|
|
||||||
|
endmenu
|
||||||
|
|
||||||
comment "Applets"
|
comment "Applets"
|
||||||
|
|
||||||
source archival/Config.in
|
source archival/Config.in
|
||||||
|
3
Makefile
3
Makefile
@ -162,7 +162,7 @@ help:
|
|||||||
|
|
||||||
ifneq ($(strip $(HAVE_DOT_CONFIG)),y)
|
ifneq ($(strip $(HAVE_DOT_CONFIG)),y)
|
||||||
# Default target if none was requested explicitly
|
# Default target if none was requested explicitly
|
||||||
all: defconfig menuconfig ;
|
all: menuconfig ;
|
||||||
|
|
||||||
ifneq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
|
ifneq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
|
||||||
# warn if no configuration exists and we are asked to build a non-config target
|
# 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
|
$(Q)$(MAKE) -C scripts/config ncurses conf mconf
|
||||||
|
|
||||||
menuconfig: scripts/config/mconf
|
menuconfig: scripts/config/mconf
|
||||||
|
@[ -f .config ] || make $(MAKEFLAGS) defconfig
|
||||||
@./scripts/config/mconf $(CONFIG_CONFIG_IN)
|
@./scripts/config/mconf $(CONFIG_CONFIG_IN)
|
||||||
|
|
||||||
config: scripts/config/conf
|
config: scripts/config/conf
|
||||||
|
Loading…
Reference in New Issue
Block a user