From 2a691470345a0024dd7ffaf47ad3d0f5f4f41924 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@mars.(none)>
Date: Mon, 25 Jul 2005 20:26:04 +0000
Subject: kbuild: fix make O=...

kbuild failed to locate Kbuild.include.
Teach kbuild how to find Kbuild files when using make O=...

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
---
 scripts/Makefile.build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'scripts/Makefile.build')

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index ebed6a41bc69..8f4f5a347767 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -10,7 +10,9 @@ __build:
 # Read .config if it exist, otherwise ignore
 -include .config
 
-include $(if $(wildcard $(obj)/Kbuild), $(obj)/Kbuild, $(obj)/Makefile)
+# The filename Kbuild has precedence over Makefile
+include $(if $(wildcard $(srctree)/$(src)/Kbuild), \
+                        $(srctree)/$(src)/Kbuild, $(srctree)/$(src)/Makefile)
 
 include scripts/Kbuild.include
 include scripts/Makefile.lib
-- 
cgit v1.2.3-59-g8ed1b