diff options
| author | Björn Gustavsson <[email protected]> | 2013-02-14 11:55:51 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-02-14 11:55:51 +0100 |
| commit | aadc966c0350dd1a07574b925546488ce82ce08d (patch) | |
| tree | 36c72ac71d0eb8b099f8b099df31db66e87b108f | |
| parent | 37213d9ca054bb9ab3389de959cda58abedf9b06 (diff) | |
| parent | 26d858437e21c222439f272ce9eb244d4869d339 (diff) | |
| download | otp-aadc966c0350dd1a07574b925546488ce82ce08d.tar.gz otp-aadc966c0350dd1a07574b925546488ce82ce08d.tar.bz2 otp-aadc966c0350dd1a07574b925546488ce82ce08d.zip | |
Merge branch 'bjorn/remove-packages/OTP-10348'
* bjorn/remove-packages/OTP-10348:
edoc: Fix building of documentation in sub directories
| -rw-r--r-- | lib/edoc/src/edoc_lib.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/edoc/src/edoc_lib.erl b/lib/edoc/src/edoc_lib.erl index 3d193c4bfa..d9c225e099 100644 --- a/lib/edoc/src/edoc_lib.erl +++ b/lib/edoc/src/edoc_lib.erl @@ -865,11 +865,14 @@ find_sources_2(Dir, Pkg, Rec, Ext, Skip) -> [] end. -find_sources_3(Es, Dir, '', Rec, Ext, Skip) -> +find_sources_3(Es, Dir, Pkg, Rec, Ext, Skip) -> [find_sources_2(filename:join(Dir, E), - to_atom(E), Rec, Ext, Skip) + to_atom(join(Pkg, E)), Rec, Ext, Skip) || E <- Es, is_package_dir(E, Dir)]. +join('', E) -> E; +join(Pkg, E) -> filename:join(Pkg, E). + is_source_file(Name, Ext) -> (filename:extension(Name) == Ext) andalso is_name(filename:rootname(Name, Ext)). |