aboutsummaryrefslogtreecommitdiffstats
path: root/erlang.mk
diff options
context:
space:
mode:
authorJesper Louis Andersen <[email protected]>2013-07-12 00:10:35 +0200
committerJesper Louis Andersen <[email protected]>2013-07-12 00:10:35 +0200
commitb32b9c3c44c31fa98d9ba2d32f77dd9960e1f7cc (patch)
treecf08adcb31f1ab390d542f4564e9494f6f25230c /erlang.mk
parent90cba7b8c57dd87e222dfec64e0120fbb27d29a3 (diff)
downloaderlang.mk-b32b9c3c44c31fa98d9ba2d32f77dd9960e1f7cc.tar.gz
erlang.mk-b32b9c3c44c31fa98d9ba2d32f77dd9960e1f7cc.tar.bz2
erlang.mk-b32b9c3c44c31fa98d9ba2d32f77dd9960e1f7cc.zip
Set ERL_LIBS to $(DEPS_DIR) rather than `deps`
This solves a recursion problem when compiling deeper recursive makefile structures. All dependencies are pulled to the top-level dependencies directory by virtue of DEPS_DIR, but the recursive make calls to erlc fails since the value is hard-coded.
Diffstat (limited to 'erlang.mk')
-rw-r--r--erlang.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/erlang.mk b/erlang.mk
index 3ddcf21..ad17c60 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -65,8 +65,8 @@ app: ebin/$(PROJECT).app
> ebin/$(PROJECT).app
define compile_erl
- $(erlc_verbose) ERL_LIBS=deps erlc -v $(ERLC_OPTS) -o ebin/ -pa ebin/ \
- -I include/ $(COMPILE_FIRST_PATHS) $(1)
+ $(erlc_verbose) ERL_LIBS=$(DEPS_DIR) erlc -v $(ERLC_OPTS) -o ebin/ \
+ -pa ebin/ -I include/ $(COMPILE_FIRST_PATHS) $(1)
endef
define compile_xyrl