X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2FMakefile.build;h=506e3f3befe3104b35d2518fd42af7fb53048f67;hb=8d286aa5eaf951bf53d4a0f64576d4b377c435ba;hp=282bfb310f5b925c9d51fa7b443a6491c34030f9;hpb=cfca82f2179dd1aee84a5bf3b14710e4d7487aed;p=linux-2.6

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 282bfb310f..506e3f3bef 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -10,8 +10,11 @@ __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
+kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
+include $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, $(kbuild-dir)/Makefile)
 
+include scripts/Kbuild.include
 include scripts/Makefile.lib
 
 ifdef host-progs