aboutsummaryrefslogtreecommitdiffstats
path: root/erlang.mk
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2013-12-02 15:50:39 +0100
committerLoïc Hoguin <[email protected]>2013-12-02 15:50:39 +0100
commitd51f7fc261199d55098c3e2d447aa05cd2d07dc2 (patch)
tree56a6aac4ba3bb7d22f9728561338bcfb8ccddf3a /erlang.mk
parent984a6c27683064d0f7479a1015aae5c2636ed0b6 (diff)
downloaderlang.mk-d51f7fc261199d55098c3e2d447aa05cd2d07dc2.tar.gz
erlang.mk-d51f7fc261199d55098c3e2d447aa05cd2d07dc2.tar.bz2
erlang.mk-d51f7fc261199d55098c3e2d447aa05cd2d07dc2.zip
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.
Diffstat (limited to 'erlang.mk')
-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 \