[PATCH] Fix function/macro name collision on i386 oprofile

[linux-2.6] / scripts / Makefile.build

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index ebed6a41bc69bf0e75ca29c694e8114846bfeda9..506e3f3befe3104b35d2518fd42af7fb53048f67 100644 (file)
--- 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
+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