commit f5c66bdb1843dd84a899da6bc34a46563e5847f0
author Masahiro Yamada <yamada.m@jp.panasonic.com> Tue Mar 11 11:05:18 2014 +0900
committer Tom Rini <trini@ti.com> Wed Mar 12 17:04:54 2014 -0400
tree 117065e9b144ece96a179f20345fec39d4ede896
parent 4ab3fc5eba1d24f37ab33f83ea39c1f7082075d3

kbuild: use $(KBUILD_SRC) to check out-of-tree build

Non-empty $(KBUILD_SRC) means out-of-tree build.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

Makefile

diff --git a/Makefile b/Makefile
index 8a1fe9b..1b1cfb8 100644
--- a/Makefile
+++ b/Makefile
@@ -556,11 +556,9 @@
 
 # Use UBOOTINCLUDE when you must reference the include/ directory.
 # Needed to be compatible with the O= option
-UBOOTINCLUDE    :=
-ifneq ($(OBJTREE),$(SRCTREE))
-UBOOTINCLUDE	+= -I$(OBJTREE)/include
-endif
-UBOOTINCLUDE	+= -I$(srctree)/include \
+UBOOTINCLUDE    := \
+		-Iinclude \
+		$(if $(KBUILD_SRC), -I$(srctree)/include) \
 		-I$(srctree)/arch/$(ARCH)/include
 
 NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)