From 153b1beaeb02e1d4780428c0387b7003644e402b Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Fri, 27 Jul 2007 12:37:30 +0000
Subject: - 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.

---
 Makefile                        | 6 ++++--
 package/config/Makefile         | 2 +-
 package/config/Makefile.kconfig | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 61c776da9..f06977797 100644
--- a/Makefile
+++ b/Makefile
@@ -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
-- 
cgit v1.2.3