summaryrefslogtreecommitdiff
path: root/src/rebar_dir.erl
diff options
context:
space:
mode:
authorFred Hebert <mononcqc@ferd.ca>2015-05-30 18:32:59 -0400
committerFred Hebert <mononcqc@ferd.ca>2015-05-30 18:32:59 -0400
commit4ac482e01826a01572ebbc735baed9ad81012c4a (patch)
treeb23a915775c9fd6bd86fa515d92b0361097ad25e /src/rebar_dir.erl
parentb51a0e314b2fb5a26c99625d025d70bf5c571b23 (diff)
parentd2b62ea1f2b101b3ff2ec74c8328f2001e854b70 (diff)
Merge pull request #483 from talentdeficit/root_config_src_dirs
allow `src_dirs` and `extra_src_dirs` at the root of the rebar config
Diffstat (limited to 'src/rebar_dir.erl')
-rw-r--r--src/rebar_dir.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rebar_dir.erl b/src/rebar_dir.erl
index e810912..cb643ab 100644
--- a/src/rebar_dir.erl
+++ b/src/rebar_dir.erl
@@ -132,7 +132,7 @@ src_dirs(State) -> src_dirs(State, []).
src_dirs(State, Default) ->
ErlOpts = rebar_utils:erl_opts(State),
Vs = proplists:get_all_values(src_dirs, ErlOpts),
- case lists:append(Vs) of
+ case lists:append([rebar_state:get(State, src_dirs, []) | Vs]) of
[] -> Default;
Dirs -> Dirs
end.
@@ -144,7 +144,7 @@ extra_src_dirs(State) -> extra_src_dirs(State, []).
extra_src_dirs(State, Default) ->
ErlOpts = rebar_utils:erl_opts(State),
Vs = proplists:get_all_values(extra_src_dirs, ErlOpts),
- case lists:append(Vs) of
+ case lists:append([rebar_state:get(State, extra_src_dirs, []) | Vs]) of
[] -> Default;
Dirs -> Dirs
end.