aboutsummaryrefslogtreecommitdiffstats
path: root/core/deps.mk
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2015-10-22 12:21:29 +0200
committerLoïc Hoguin <[email protected]>2015-10-22 12:21:29 +0200
commit8d49f08a11da8314cd999f9a03af62ef018595c4 (patch)
treeaf2edfb85a2d1f637eeb9dea34db5a11c3998df4 /core/deps.mk
parentd9c4a25dc182590703fbf55bc8d4ea6af8f7e834 (diff)
downloaderlang.mk-8d49f08a11da8314cd999f9a03af62ef018595c4.tar.gz
erlang.mk-8d49f08a11da8314cd999f9a03af62ef018595c4.tar.bz2
erlang.mk-8d49f08a11da8314cd999f9a03af62ef018595c4.zip
Use relative path to erlang.mk file in autopatched deps
Diffstat (limited to 'core/deps.mk')
-rw-r--r--core/deps.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/deps.mk b/core/deps.mk
index 7d991b0..b9ddfab 100644
--- a/core/deps.mk
+++ b/core/deps.mk
@@ -122,7 +122,8 @@ endef
# Overwrite erlang.mk with the current file by default.
ifeq ($(NO_AUTOPATCH_ERLANG_MK),)
define dep_autopatch_erlang_mk
- echo "include $(ERLANG_MK_FILENAME)" > $(DEPS_DIR)/$(1)/erlang.mk
+ echo "include $(call core_relpath,$(dir $(ERLANG_MK_FILENAME)),$(DEPS_DIR)/app)/erlang.mk" \
+ > $(DEPS_DIR)/$1/erlang.mk
endef
else
define dep_autopatch_erlang_mk
@@ -414,7 +415,7 @@ define dep_autopatch_rebar.erl
end,
[PortSpec(S) || S <- PortSpecs]
end,
- Write("\ninclude $(ERLANG_MK_FILENAME)"),
+ Write("\ninclude $(call core_relpath,$(dir $(ERLANG_MK_FILENAME)),$(DEPS_DIR)/app)/erlang.mk"),
RunPlugin = fun(Plugin, Step) ->
case erlang:function_exported(Plugin, Step, 2) of
false -> ok;