From: Guillaume Chazarain <guichaz@yahoo.fr>
Date: Tue, 11 Dec 2007 12:22:08 +0000 (+0100)
Subject: kbuild: re-enable Makefile generation in a new O=... directory
X-Git-Tag: v2.6.24-rc6~64^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=971edcfc8bee41c0b41e21bf10751c5b22028a82;p=linux-2.6

kbuild: re-enable Makefile generation in a new O=... directory

The commit:
18c32dac75b187d1a4e858f3cfdf03e844129f5e "kbuild: fix
building with O=.. options"
disabled the creation of a Makefile in a new O=... directory. Restore it.

Signed-off-by: Guillaume Chazarain <guichaz@yahoo.fr>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---

diff --git a/scripts/mkmakefile b/scripts/mkmakefile
index 9ad1bd7932..e0f54b9d8f 100644
--- a/scripts/mkmakefile
+++ b/scripts/mkmakefile
@@ -13,7 +13,7 @@
 test ! -r $2/Makefile -o -O $2/Makefile || exit 0
 # Only overwrite automatically generated Makefiles
 # (so we do not overwrite kernel Makefile)
-if ! grep -q Automatically $2/Makefile
+if test -e $2/Makefile && ! grep -q Automatically $2/Makefile
 then
 	exit 0
 fi