summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTristan Sloughter <tristan.sloughter@gmail.com>2014-12-05 16:38:11 -0600
committerTristan Sloughter <tristan.sloughter@gmail.com>2014-12-05 16:38:11 -0600
commit228e96c9eb296d236ec23dfc1ee0e6b5236c4a30 (patch)
tree6c6eef5194216c8bca445563ad27e898e4e26948 /src
parent0c2f57253de80038a6c9525cc9db703bca5cbfc3 (diff)
parent111fc9769b629d8fa1bb0acf7da19404fc84e606 (diff)
Merge pull request #41 from tsloughter/rebar2_401
merge over rebar2 PR #401
Diffstat (limited to 'src')
-rw-r--r--src/rebar_base_compiler.erl6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/rebar_base_compiler.erl b/src/rebar_base_compiler.erl
index ee023e7..293b4d8 100644
--- a/src/rebar_base_compiler.erl
+++ b/src/rebar_base_compiler.erl
@@ -104,12 +104,8 @@ simple_compile_wrapper(Source, Target, Compile3Fn, Config, true) ->
end.
target_file(SourceFile, SourceDir, SourceExt, TargetDir, TargetExt) ->
- %% Remove all leading components of the source dir from the file -- we want
- %% to maintain the deeper structure (if any) of the source file path
BaseFile = remove_common_path(SourceFile, SourceDir),
- filename:join([TargetDir, filename:dirname(BaseFile),
- filename:basename(BaseFile, SourceExt) ++ TargetExt]).
-
+ filename:join([TargetDir, filename:basename(BaseFile, SourceExt) ++ TargetExt]).
remove_common_path(Fname, Path) ->
remove_common_path1(filename:split(Fname), filename:split(Path)).