From 6aab2eded23c7ff36cc416a2145210b212e50da6 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Wed, 27 Jul 2005 22:11:01 +0200 Subject: [PATCH] --- yaml --- r: 7248 b: refs/heads/master c: db8c1a7b2ca25f37b1429c00e82d6568f86caec1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/scripts/Makefile.build | 4 ++-- trunk/scripts/Makefile.clean | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dc5806aee1e4..d2e891ced81e 100644 --- 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 index 8f4f5a347767..506e3f3befe3 100644 --- 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 index 62351b630fab..8974ea5fc878 100644 --- 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 # ==========================================================================