From 608f6a85ad68a7bbd9140fcd0258161689612df0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Thu, 24 Sep 2015 17:46:32 +0200 Subject: Add tests for IGNORE_DEPS Fix IGNORE_DEPS not being propagated downward. Fix IGNORE_DEPS handling with autopatched Rebar projects, where the user defined value was overriden with the one from autopatching. --- core/deps.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'core/deps.mk') diff --git a/core/deps.mk b/core/deps.mk index 91c42f9..814e7db 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -6,6 +6,7 @@ # Configuration. IGNORE_DEPS ?= +export IGNORE_DEPS DEPS_DIR ?= $(CURDIR)/deps export DEPS_DIR @@ -160,7 +161,7 @@ define dep_autopatch_rebar.erl Escape = fun (Text) -> re:replace(Text, "\\\\$$$$", "\$$$$$$$$", [global, {return, list}]) end, - Write("IGNORE_DEPS = edown eper eunit_formatters meck node_package " + Write("IGNORE_DEPS += edown eper eunit_formatters meck node_package " "rebar_lock_deps_plugin rebar_vsn_plugin reltool_util\n"), Write("C_SRC_DIR = /path/do/not/exist\n"), Write("DRV_CFLAGS = -fPIC\nexport DRV_CFLAGS\n"), -- cgit v1.2.3