aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTristan Sloughter <[email protected]>2014-11-17 20:14:47 -0600
committerTristan Sloughter <[email protected]>2014-11-17 21:05:25 -0600
commit1a47eb9b920b38bf4607c4691d873774b74cdcd9 (patch)
treec4df50cffa816ee26ab1e6f84b781d58d40b4470 /src
parent3f93086c57664015b921221647c0f2b56519fd7c (diff)
downloadrelx-1a47eb9b920b38bf4607c4691d873774b74cdcd9.tar.gz
relx-1a47eb9b920b38bf4607c4691d873774b74cdcd9.tar.bz2
relx-1a47eb9b920b38bf4607c4691d873774b74cdcd9.zip
add back _rel to app discovery, fix relup tests to notice
Diffstat (limited to 'src')
-rw-r--r--src/rlx_prv_app_discover.erl10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/rlx_prv_app_discover.erl b/src/rlx_prv_app_discover.erl
index 72cdea2..8e2bd24 100644
--- a/src/rlx_prv_app_discover.erl
+++ b/src/rlx_prv_app_discover.erl
@@ -80,9 +80,17 @@ get_lib_dirs(State) ->
false ->
LibDirs0;
true ->
+ Output = erlang:iolist_to_binary(rlx_state:base_output_dir(State)),
+ OutputDir = case ec_file:exists(binary_to_list(Output)) of
+ true ->
+ Output;
+ false ->
+ []
+ end,
lists:flatten([LibDirs0,
add_common_project_dirs(State),
- add_system_lib_dir(State)])
+ add_system_lib_dir(State),
+ OutputDir])
end.
-spec add_common_project_dirs(rlx_state:t()) -> [file:name()].