Revert "kbuild: Use relative path when building in a subdir of the source tree"tracking-llct-misc-fixes-llct-20141013.0tracking-llct-misc-fixes-llct-20141007.0tracking-llct-misc-fixes-llct-20141001.0tracking-llct-misc-fixes-llct-20140929.0tracking-llct-misc-fixes-llct-20140926.0tracking-llct-misc-fixes-llct-20140910.0tracking-llct-misc-fixes-llct-20140903.0tracking-llct-misc-fixes-llct-20140829.0tracking-llct-misc-fixes-llct-20140806.0tracking-llct-misc-fixes-llct-20140721.0tracking-llct-misc-fixes-llct-20140714.0tracking-llct-misc-fixes-llct-20140709.0tracking-llct-misc-fixes-llct-20140630.0

This reverts commit 9da0763bdd82572be243fcf5161734f11568960f.
That commit broke 'make deb-pkg' when building in a subdir of the source tree.

Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>

1 files changed, 1 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index 4916d15eed79..e10228b6da2a 100644
--- a/Makefile
+++ b/Makefile
@@ -149,17 +149,7 @@ else
 _all: modules
 endif
 
-ifeq ($(KBUILD_SRC),)
-        # building in the source tree
-        srctree := .
-else
-        ifeq ($(KBUILD_SRC)/,$(dir $(CURDIR)))
-                # building in a subdirectory of the source tree
-                srctree := ..
-        else
-                srctree := $(KBUILD_SRC)
-        endif
-endif
+srctree		:= $(if $(KBUILD_SRC),$(KBUILD_SRC),.)
 objtree		:= .
 src		:= $(srctree)
 obj		:= $(objtree)