summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Ravnborg <sam@mars.(none)>2005-07-25 20:26:04 +0000
committerSam Ravnborg <sam@mars.(none)>2005-07-25 20:26:04 +0000
commit2a691470345a0024dd7ffaf47ad3d0f5f4f41924 (patch)
tree593421beaa683526ed187fd540c156c9a1536f74
parent8ec4b4ff1c89bb280e662b84eba503ca44abe836 (diff)
downloadlinux-2a691470345a0024dd7ffaf47ad3d0f5f4f41924.tar.bz2
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> ---
-rw-r--r--Makefile2
-rw-r--r--scripts/Makefile.build4
-rw-r--r--scripts/Makefile.clean4
3 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 7c607dc64479..ed1f4b5b714f 100644
--- a/Makefile
+++ b/Makefile
@@ -310,7 +310,7 @@ cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh \
MAKEFLAGS += --include-dir=$(srctree)
# We need some generic definitions
-include scripts/Kbuild.include
+include $(srctree)/scripts/Kbuild.include
# For maximum performance (+ possibly random breakage, uncomment
# the following)
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
diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
index ff3e87dbf387..9c978b7bbdf1 100644
--- a/scripts/Makefile.clean
+++ b/scripts/Makefile.clean
@@ -7,7 +7,9 @@ src := $(obj)
.PHONY: __clean
__clean:
-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)
# Figure out what we need to build from the various variables
# ==========================================================================