From ef19b6611c0415ae22c669c640c14b7d801f4052 Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@novell.com>
Date: Tue, 2 May 2006 12:33:20 +0200
Subject: [PATCH] --- yaml --- r: 26547 b: refs/heads/master c:
 fd5f0cd6b0cef59ba18e5ac13be5b2775fa6ec28 h: refs/heads/master i:   26545:
 0f181ecb1670a666b3c9e95a01249efe6b914187   26543:
 ffcd929936131649263a6efdf742735b9992c348 v: v3

---
 [refs]                   |  2 +-
 trunk/Makefile           | 16 +++++++---------
 trunk/scripts/mkmakefile |  5 ++++-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 80de72ac2af2..752258961d2e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc873e1aa1fa916a485294117a9846e668505671
+refs/heads/master: fd5f0cd6b0cef59ba18e5ac13be5b2775fa6ec28
diff --git a/trunk/Makefile b/trunk/Makefile
index 8517f7ba2473..9e4c5692a32f 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -344,16 +344,14 @@ scripts_basic:
 scripts/basic/%: scripts_basic ;
 
 PHONY += outputmakefile
-# outputmakefile generate a Makefile to be placed in output directory, if
-# using a seperate output directory. This allows convinient use
-# of make in output directory
+# outputmakefile generates a Makefile in the output directory, if using a
+# separate output directory. This allows convenient use of make in the
+# output directory.
 outputmakefile:
-	$(Q)if test ! $(srctree) -ef $(objtree); then \
-	$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile              \
-	    $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL)         \
-	    > $(objtree)/Makefile;                                 \
-	    echo '  GEN    $(objtree)/Makefile';                   \
-	fi
+ifneq ($(KBUILD_SRC),)
+	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile \
+	    $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL)
+endif
 
 # To make sure we do not include .config for any of the *config targets
 # catch them early, and hand them over to scripts/kconfig/Makefile
diff --git a/trunk/scripts/mkmakefile b/trunk/scripts/mkmakefile
index a22cbedd3b3e..7f9d544f9b6c 100644
--- a/trunk/scripts/mkmakefile
+++ b/trunk/scripts/mkmakefile
@@ -10,7 +10,10 @@
 # $4 - patchlevel
 
 
-cat << EOF
+test ! -r $2/Makefile -o -O $2/Makefile || exit 0
+echo "  GEN     $2/Makefile"
+
+cat << EOF > $2/Makefile
 # Automatically generated by $0: don't edit
 
 VERSION = $3