Merge branch 'testing'
This commit is contained in:
commit
2cb1564c8b
5
Makefile
5
Makefile
|
@ -201,10 +201,11 @@ autoconf.h .config:
|
||||||
@echo make\'s goal: $(MAKECMDGOALS)
|
@echo make\'s goal: $(MAKECMDGOALS)
|
||||||
ifneq ($(MAKECMDGOALS),menuconfig)
|
ifneq ($(MAKECMDGOALS),menuconfig)
|
||||||
# make sure menuconfig isn't called twice, on `make menuconfig'
|
# make sure menuconfig isn't called twice, on `make menuconfig'
|
||||||
test -s autoconf.h -a -s .config || $(MAKE) no_deps=t menuconfig
|
#test -s autoconf.h -a -s .config || $(MAKE) no_deps=t menuconfig
|
||||||
# test the target file, test fails if it doesn't exist
|
# test the target file, test fails if it doesn't exist
|
||||||
# and will keep make from looping menuconfig.
|
# and will keep make from looping menuconfig.
|
||||||
test -s autoconf.h -a -s .config
|
#test -s autoconf.h -a -s .config
|
||||||
|
touch autoconf.h .config
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include depend.mk
|
include depend.mk
|
||||||
|
|
|
@ -1754,6 +1754,7 @@ if [ -z $2 ]; then # Interactive mode
|
||||||
else # Second argument give; noninteractive!
|
else # Second argument give; noninteractive!
|
||||||
echo "Loading configuration file $2"
|
echo "Loading configuration file $2"
|
||||||
load_config_file $2
|
load_config_file $2
|
||||||
|
cleanup1
|
||||||
save_configuration
|
save_configuration
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue