diff options
author | Tristan Sloughter <t@crashfast.com> | 2014-12-05 09:58:05 -0600 |
---|---|---|
committer | Tristan Sloughter <t@crashfast.com> | 2014-12-05 10:28:16 -0600 |
commit | 111fc9769b629d8fa1bb0acf7da19404fc84e606 (patch) | |
tree | 6c6eef5194216c8bca445563ad27e898e4e26948 | |
parent | 003e93e82bd427e6fdca999f9b6cef6b277b7045 (diff) |
merge over rebar2 PR #401
-rw-r--r-- | src/rebar_base_compiler.erl | 6 |
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)). |