aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2019-06-24 13:01:59 +0200
committerLoïc Hoguin <[email protected]>2019-06-24 13:01:59 +0200
commit24ff52b9d3ec99528868c8e06bde17e9a51d6ba5 (patch)
treeff40dfa0e0025bd106ab8e79b6a3c30fb9598a1f
parentc39d3f7c0bd4d8fb33ff6b33843407a3676a3c4b (diff)
downloaderlang.mk-24ff52b9d3ec99528868c8e06bde17e9a51d6ba5.tar.gz
erlang.mk-24ff52b9d3ec99528868c8e06bde17e9a51d6ba5.tar.bz2
erlang.mk-24ff52b9d3ec99528868c8e06bde17e9a51d6ba5.zip
Fix more path issues on Windows
-rw-r--r--plugins/cover.mk6
-rw-r--r--plugins/erlydtl.mk2
-rw-r--r--plugins/eunit.mk2
3 files changed, 5 insertions, 5 deletions
diff --git a/plugins/cover.mk b/plugins/cover.mk
index 3d18c00..68f5b98 100644
--- a/plugins/cover.mk
+++ b/plugins/cover.mk
@@ -35,9 +35,9 @@ endif
ifdef COVER
define cover.erl
CoverSetup = fun() ->
- Dirs = ["$(CURDIR)/ebin"
- $(foreach a,$(COVER_APPS),$(comma) "$(APPS_DIR)/$a/ebin")
- $(foreach d,$(COVER_DEPS),$(comma) "$(DEPS_DIR)/$d/ebin")],
+ Dirs = ["$(call core_native_path,$(CURDIR)/ebin)"
+ $(foreach a,$(COVER_APPS),$(comma) "$(call core_native_path,$(APPS_DIR)/$a/ebin)")
+ $(foreach d,$(COVER_DEPS),$(comma) "$(call core_native_path,$(DEPS_DIR)/$d/ebin)")],
[begin
case filelib:is_dir(Dir) of
false -> false;
diff --git a/plugins/erlydtl.mk b/plugins/erlydtl.mk
index 466b634..7720a36 100644
--- a/plugins/erlydtl.mk
+++ b/plugins/erlydtl.mk
@@ -42,7 +42,7 @@ define erlydtl_compile.erl
"" ->
filename:basename(F, ".dtl");
_ ->
- "$(DTL_PATH)/" ++ F2 = filename:rootname(F, ".dtl"),
+ "$(call core_native_path,$(DTL_PATH))/" ++ F2 = filename:rootname(F, ".dtl"),
re:replace(F2, "/", "_", [{return, list}, global])
end,
Module = list_to_atom("$(DTL_PREFIX)" ++ string:to_lower(Module0) ++ "$(DTL_SUFFIX)"),
diff --git a/plugins/eunit.mk b/plugins/eunit.mk
index 1847453..aa4cc9a 100644
--- a/plugins/eunit.mk
+++ b/plugins/eunit.mk
@@ -27,7 +27,7 @@ define eunit.erl
ok -> ok;
error -> halt(2)
end,
- CoverExport("$(COVER_DATA_DIR)/eunit.coverdata"),
+ CoverExport("$(call core_native_path,$(COVER_DATA_DIR))/eunit.coverdata"),
halt()
endef