From d51f7fc261199d55098c3e2d447aa05cd2d07dc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Mon, 2 Dec 2013 15:50:39 +0100 Subject: Append DEPS_DIR at the end of ERL_LIBS if ERL_LIBS is defined Only done if DEPS_DIR isn't found in it yet. Thanks to Sean Chalmers for the debugging and original fix. --- erlang.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 \ -- cgit v1.2.3