From f91178caa2ffe0b2fed305c59dec0c09919a10a6 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@mars.ravnborg.org>
Date: Mon, 26 Dec 2005 23:34:03 +0100
Subject: [PATCH] --- yaml --- r: 15903 b: refs/heads/master c:
 752625cff3eba81cbc886988d5b420064c033948 h: refs/heads/master i:   15901:
 1208faa6bd79a87436d13566a0956da5f2adf9c3   15899:
 971065823fa62bf8c2b9f83f450a949ba58c1599   15895:
 a04e55759a2ab016de4a55c46167692a5b830e4c   15887:
 5fec7bd9b8c92a6f0240bb72d4afeae9f85add01   15871:
 96b097471a5efccf41a91bd7ac0dc96c72b4d8c2 v: v3

---
 [refs]                       |  2 +-
 trunk/Makefile               | 10 ++++++----
 trunk/scripts/kconfig/util.c |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 53754116c7ca..163a48d15ede 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54e08a2392e99ba9e48ce1060e0b52a39118419c
+refs/heads/master: 752625cff3eba81cbc886988d5b420064c033948
diff --git a/trunk/Makefile b/trunk/Makefile
index 922c7633797f..d3598ef3c777 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -477,18 +477,20 @@ ifeq ($(dot-config),1)
 
 # Read in dependencies to all Kconfig* files, make sure to run
 # oldconfig if changes are detected.
--include .config.cmd
+-include .kconfig.d
 
 include .config
 
 # If .config needs to be updated, it will be done via the dependency
 # that autoconf has on .config.
 # To avoid any implicit rule to kick in, define an empty command
-.config: ;
+.config .kconfig.d: ;
 
 # If .config is newer than include/linux/autoconf.h, someone tinkered
-# with it and forgot to run make oldconfig
-include/linux/autoconf.h: .config
+# with it and forgot to run make oldconfig.
+# If kconfig.d is missing then we are probarly in a cleaned tree so
+# we execute the config step to be sure to catch updated Kconfig files
+include/linux/autoconf.h: .kconfig.d .config
 	$(Q)mkdir -p include/linux
 	$(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig
 else
diff --git a/trunk/scripts/kconfig/util.c b/trunk/scripts/kconfig/util.c
index 1fa4c0b801b3..a711007ebe30 100644
--- a/trunk/scripts/kconfig/util.c
+++ b/trunk/scripts/kconfig/util.c
@@ -33,7 +33,7 @@ int file_write_dep(const char *name)
 	FILE *out;
 
 	if (!name)
-		name = ".config.cmd";
+		name = ".kconfig.d";
 	out = fopen("..config.tmp", "w");
 	if (!out)
 		return 1;