---

yaml --- r: 7248 b: refs/heads/master c: db8c1a7 h: refs/heads/master v: v3
git-mirror · Jul 27, 2005 · 6aab2ed · 6aab2ed
1 parent 4c28e86
commit 6aab2ed
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72ba47c1b293ae78f7d798b458bb9d3db65c7551
+refs/heads/master: db8c1a7b2ca25f37b1429c00e82d6568f86caec1
diff --git a/trunk/scripts/Makefile.build b/trunk/scripts/Makefile.build
@@ -11,8 +11,8 @@ __build:
 -include .config
 
 # The filename Kbuild has precedence over Makefile
-include $(if $(wildcard $(srctree)/$(src)/Kbuild), \
-                        $(srctree)/$(src)/Kbuild, $(srctree)/$(src)/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

diff --git a/trunk/scripts/Makefile.clean b/trunk/scripts/Makefile.clean
@@ -13,8 +13,8 @@ __clean:
 clean := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.clean obj
 
 # The filename Kbuild has precedence over Makefile
-include $(if $(wildcard $(srctree)/$(src)/Kbuild), \
-                        $(srctree)/$(src)/Kbuild, $(srctree)/$(src)/Makefile)
+kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
+include $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, $(kbuild-dir)/Makefile)
 
 # Figure out what we need to build from the various variables
 # ==========================================================================