Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/fix-kbuild

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/fix-kbuild: kbuild: re-enable Makefile generation in a new O=... directory
git-mirror · Dec 17, 2007 · 5cdddec · 5cdddec
2 parents ac0b50d + 971edcf
commit 5cdddec
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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