diff options
author | Loïc Hoguin <[email protected]> | 2013-12-02 15:50:39 +0100 |
---|---|---|
committer | Loïc Hoguin <[email protected]> | 2013-12-02 15:50:39 +0100 |
commit | d51f7fc261199d55098c3e2d447aa05cd2d07dc2 (patch) | |
tree | 56a6aac4ba3bb7d22f9728561338bcfb8ccddf3a | |
parent | 984a6c27683064d0f7479a1015aae5c2636ed0b6 (diff) | |
download | erlang.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.
-rw-r--r-- | erlang.mk | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -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 \ |