2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 8f4f5a347767..506e3f3befe3 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -11,8 +11,8 @@ __build:
 -include .config
 # The filename Kbuild has precedence over Makefile
-include $(if $(wildcard $(srctree)/$(src)/Kbuild), \
+kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
-                        $(srctree)/$(src)/Kbuild, $(srctree)/$(src)/Makefile)
+include $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, $(kbuild-dir)/Makefile)
 include scripts/Kbuild.include
 include scripts/Makefile.lib
diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
index 62351b630fab..8974ea5fc878 100644
--- a/scripts/Makefile.clean
+++ b/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), \
+kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
-                        $(srctree)/$(src)/Kbuild, $(srctree)/$(src)/Makefile)
+include $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, $(kbuild-dir)/Makefile)
 # Figure out what we need to build from the various variables
 # ==========================================================================

diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 8f4f5a347767..506e3f3befe3 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build
@@ -11,8 +11,8 @@ __build:
11	-include .config	11	-include .config
12		12
13	# The filename Kbuild has precedence over Makefile	13	# The filename Kbuild has precedence over Makefile
14	include $(if $(wildcard $(srctree)/$(src)/Kbuild), \	14	kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
15	$(srctree)/$(src)/Kbuild, $(srctree)/$(src)/Makefile)	15	include $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, $(kbuild-dir)/Makefile)
16		16
17	include scripts/Kbuild.include	17	include scripts/Kbuild.include
18	include scripts/Makefile.lib	18	include scripts/Makefile.lib


diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean index 62351b630fab..8974ea5fc878 100644 --- a/scripts/Makefile.clean +++ b/scripts/Makefile.clean
@@ -13,8 +13,8 @@ __clean:
13	clean := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.clean obj	13	clean := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.clean obj
14		14
15	# The filename Kbuild has precedence over Makefile	15	# The filename Kbuild has precedence over Makefile
16	include $(if $(wildcard $(srctree)/$(src)/Kbuild), \	16	kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
17	$(srctree)/$(src)/Kbuild, $(srctree)/$(src)/Makefile)	17	include $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, $(kbuild-dir)/Makefile)
18		18
19	# Figure out what we need to build from the various variables	19	# Figure out what we need to build from the various variables
20	# ==========================================================================	20	# ==========================================================================