aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2013-12-02 15:52:29 +0100
committerLoïc Hoguin <[email protected]>2013-12-02 15:52:29 +0100
commit72ef4ef2f771570081934212ad11d55744e7f68e (patch)
tree07c4759631617de2f9a9995251b7e938698b9df0
parent893e612b61400005f692f58606dcdf2949568889 (diff)
downloadcowboy-72ef4ef2f771570081934212ad11d55744e7f68e.tar.gz
cowboy-72ef4ef2f771570081934212ad11d55744e7f68e.tar.bz2
cowboy-72ef4ef2f771570081934212ad11d55744e7f68e.zip
Update erlang.mk again
-rw-r--r--erlang.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/erlang.mk b/erlang.mk
index 0dadfbb..107cdd5 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -90,7 +90,13 @@ ALL_TEST_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(TEST_DEPS))
# Application.
-ERL_LIBS ?= $(DEPS_DIR)
+ifeq ($(filter $(DEPS_DIR),$(subst :, ,$(ERL_LIBS))),)
+ifeq ($(ERL_LIBS),)
+ ERL_LIBS = $(DEPS_DIR)
+else
+ ERL_LIBS := $(ERL_LIBS):$(DEPS_DIR)
+endif
+endif
export ERL_LIBS
ERLC_OPTS ?= -Werror +debug_info +warn_export_all +warn_export_vars \