summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2010-06-11 14:09:51 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-06-22 15:44:40 +0200
commit600c0e987e3a03c383dfb0c3ffe57c12d366cb1b (patch)
tree7b3fc0e57f99c2f2ff1e65f3dbdecc9f3a3228ed /Makefile
parent72861584e33759ca4b531a47702d04ddbf730548 (diff)
downloadbarebox-600c0e987e3a03c383dfb0c3ffe57c12d366cb1b.tar.gz
barebox-600c0e987e3a03c383dfb0c3ffe57c12d366cb1b.tar.xz
Allow to merge default environment from more than one directory
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 0 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index d17ca47ff9..e24ae45a6e 100644
--- a/Makefile
+++ b/Makefile
@@ -1299,18 +1299,3 @@ Makefile: ;
# information in a variable se we can use it in if_changed and friends.
.PHONY: $(PHONY)
-#
-# sanity checks for check default environemnt
-#
-ifdef CONFIG_DEFAULT_ENVIRONMENT
-
-ifeq ($(CONFIG_DEFAULT_ENVIRONMENT_PATH),"")
-$(error default environment path empty))
-endif
-
-saved-env_path := $(CONFIG_DEFAULT_ENVIRONMENT_PATH)
-CONFIG_DEFAULT_ENVIRONMENT_PATH := $(shell cd $(if $(filter /%,$(CONFIG_DEFAULT_ENVIRONMENT_PATH)),,$(srctree)/)$(CONFIG_DEFAULT_ENVIRONMENT_PATH) && /bin/pwd)
-$(if $(CONFIG_DEFAULT_ENVIRONMENT_PATH),, \
- $(error default environment path $(saved-env_path) does not exist))
-
-endif # ifdef CONFIG_DEFAULT_ENVIRONMENT