diff options
| author | Jordan Wilberding <[email protected]> | 2014-11-20 08:35:20 -0800 |
|---|---|---|
| committer | Jordan Wilberding <[email protected]> | 2014-11-20 08:35:20 -0800 |
| commit | fb9fd6019235186a0a22f4c0b6d6ace21d6c36a0 (patch) | |
| tree | 4449b097da5846f558fbdf4517dac10a54723f7b /src | |
| parent | 2db3228ad191527e582a6eec2265195ba0446a8c (diff) | |
| parent | 1a47eb9b920b38bf4607c4691d873774b74cdcd9 (diff) | |
| download | relx-fb9fd6019235186a0a22f4c0b6d6ace21d6c36a0.tar.gz relx-fb9fd6019235186a0a22f4c0b6d6ace21d6c36a0.tar.bz2 relx-fb9fd6019235186a0a22f4c0b6d6ace21d6c36a0.zip | |
Merge pull request #269 from tsloughter/relup_fix
add back _rel to app discovery, fix relup tests to notice
Diffstat (limited to 'src')
| -rw-r--r-- | src/rlx_prv_app_discover.erl | 10 |
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()]. |