diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2016-05-18 09:10:13 -0400 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2016-05-18 09:10:13 -0400 |
| commit | 41addaa53bf9a52972a9a0d071cb6db6b5e94780 (patch) | |
| tree | 63c95fe01c07f23ccd7c64a076ede6c5579505a6 | |
| parent | 3dc62dba5d1dd4980d508931fb45ce20e39ed250 (diff) | |
| parent | 91485a8ec826fa15b7af839b59a83edece970838 (diff) | |
Merge pull request #1197 from zsoci/fixpathcmd
Fix path command to consider {deps_dir, "deps"} in rebar.config
| -rw-r--r-- | src/rebar_prv_path.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rebar_prv_path.erl b/src/rebar_prv_path.erl index 4e88496..4259eec 100644 --- a/src/rebar_prv_path.erl +++ b/src/rebar_prv_path.erl @@ -77,15 +77,15 @@ paths([{rel, true}|Rest], Apps, State, Acc) -> base_dir(State) -> io_lib:format("~s", [rebar_dir:base_dir(State)]). bin_dir(State) -> io_lib:format("~s/bin", [rebar_dir:base_dir(State)]). -lib_dir(State) -> io_lib:format("~s/lib", [rebar_dir:base_dir(State)]). +lib_dir(State) -> io_lib:format("~s", [rebar_dir:deps_dir(State)]). rel_dir(State) -> io_lib:format("~s/rel", [rebar_dir:base_dir(State)]). ebin_dirs(Apps, State) -> - lists:map(fun(App) -> io_lib:format("~s/lib/~s/ebin", [rebar_dir:base_dir(State), App]) end, Apps). + lists:map(fun(App) -> io_lib:format("~s/~s/ebin", [rebar_dir:deps_dir(State), App]) end, Apps). priv_dirs(Apps, State) -> - lists:map(fun(App) -> io_lib:format("~s/lib/~s/priv", [rebar_dir:base_dir(State), App]) end, Apps). + lists:map(fun(App) -> io_lib:format("~s/~s/priv", [rebar_dir:deps_dir(State), App]) end, Apps). src_dirs(Apps, State) -> - lists:map(fun(App) -> io_lib:format("~s/lib/~s/src", [rebar_dir:base_dir(State), App]) end, Apps). + lists:map(fun(App) -> io_lib:format("~s/~s/src", [rebar_dir:deps_dir(State), App]) end, Apps). print_paths_if_exist(Paths, State) -> {RawOpts, _} = rebar_state:command_parsed_args(State), |