diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-07-27 12:37:30 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-07-27 12:37:30 +0000 |
| commit | 153b1beaeb02e1d4780428c0387b7003644e402b (patch) | |
| tree | bcccc4c78a3003a3c008555e355d7ad891e3e448 | |
| parent | 0c238e669f338d374e3140d77cb770301c45a978 (diff) | |
- fix building mconf with curses flags
- make sure to rm .config when the first 'make menuconfig' was interrupted and thus no .config.cmd was created.
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | package/config/Makefile | 2 | ||||
| -rw-r--r-- | package/config/Makefile.kconfig | 3 |
3 files changed, 8 insertions, 3 deletions
@@ -320,9 +320,11 @@ $(CONFIG)/mconf: menuconfig: $(CONFIG)/mconf @-mkdir -p $(CONFIG)/buildroot-config - @KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \ + @if ! KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \ KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \ - $(CONFIG)/mconf $(CONFIG_CONFIG_IN) + $(CONFIG)/mconf $(CONFIG_CONFIG_IN); then \ + test -f .config.cmd || rm -f .config; \ + fi config: $(CONFIG)/conf @-mkdir -p $(CONFIG)/buildroot-config diff --git a/package/config/Makefile b/package/config/Makefile index 3b4384920..f25b704e6 100644 --- a/package/config/Makefile +++ b/package/config/Makefile @@ -5,7 +5,7 @@ top_builddir=../../ srctree := . include Makefile.kconfig -HOSTCFLAGS+=-Dinline="" -include foo.h +#HOSTCFLAGS+=-Dinline="" -include foo.h -include .depend .depend: $(wildcard *.h *.c) $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) -MM *.c > .depend 2>/dev/null || : diff --git a/package/config/Makefile.kconfig b/package/config/Makefile.kconfig index 7e7e14787..016397f66 100644 --- a/package/config/Makefile.kconfig +++ b/package/config/Makefile.kconfig @@ -120,6 +120,9 @@ hostprogs-y := conf qconf gconf kxgettext ifeq ($(MAKECMDGOALS),menuconfig) hostprogs-y += mconf endif +ifeq ($(findstring mconf,$(MAKECMDGOALS)),mconf) + hostprogs-y += mconf +endif ifeq ($(MAKECMDGOALS),xconfig) qconf-target := 1 |