summaryrefslogtreecommitdiff
path: root/scripts/Makefile.build
diff options
context:
space:
mode:
authorSam Ravnborg <sam@mars.ravnborg.org>2004-11-04 01:40:52 +0100
committerSam Ravnborg <sam@mars.ravnborg.org>2004-11-04 01:40:52 +0100
commit78c72fc2b44a399eae6535feb582176c0b47b8a3 (patch)
tree1992a7002913fdcd61b76006c90ffcfbc39483a2 /scripts/Makefile.build
parent0a266a899690d37e8fe6f60b9d50e6075d7c29b8 (diff)
parent242ee42016330f04f01d2e41ce780728856a822d (diff)
Merge mars.ravnborg.org:/home/sam/bk/linux-2.6
into mars.ravnborg.org:/home/sam/bk/to-akpm
Diffstat (limited to 'scripts/Makefile.build')
-rw-r--r--scripts/Makefile.build2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 9ed771f02846..d2263a3594d2 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -10,7 +10,7 @@ __build:
# Read .config if it exist, otherwise ignore
-include .config
-include $(obj)/Makefile
+include $(if $(wildcard $(obj)/Kbuild), $(obj)/Kbuild, $(obj)/Makefile)
include scripts/Makefile.lib