From 6d739b5f74e1daaf385d19e4fcd6eead4f754213 Mon Sep 17 00:00:00 2001 From: Joerg Bornschein Date: Sun, 22 Sep 2013 16:25:43 +0200 Subject: [PATCH 1/2] make menuconfig sollte nciht zweimal durchlaufen --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c023a7e..5aa560c 100644 --- a/Makefile +++ b/Makefile @@ -201,10 +201,11 @@ autoconf.h .config: @echo make\'s goal: $(MAKECMDGOALS) ifneq ($(MAKECMDGOALS),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 # 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 include depend.mk From bfea7d526fc6d4d2d0b1417092b99e665b68e7c5 Mon Sep 17 00:00:00 2001 From: Joerg Bornschein Date: Sun, 22 Sep 2013 16:34:27 +0200 Subject: [PATCH 2/2] Cleanup in menuconfig --- scripts/Menuconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/Menuconfig b/scripts/Menuconfig index 111ef89..ce541e2 100644 --- a/scripts/Menuconfig +++ b/scripts/Menuconfig @@ -1754,6 +1754,7 @@ if [ -z $2 ]; then # Interactive mode else # Second argument give; noninteractive! echo "Loading configuration file $2" load_config_file $2 + cleanup1 save_configuration fi