diff --git a/CHANGES.md b/CHANGES.md index 90fcc2ad2716..9e1c4b691b32 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -77,6 +77,10 @@ unreleased - Support the `.cc` extension fro C++ sources (#2195, fixes #83, @rgrinberg) +- Fix detection of `README`, `LICENSE`, `CHANGE`, and `HISTORY` files. These + would be undetected whenever the project was nested in another workspace. + (#2194, @rgrinberg) + 1.9.3 (06/05/2019) ------------------ diff --git a/src/local_package.ml b/src/local_package.ml index d3eeacd0c9d3..efecba5c6476 100644 --- a/src/local_package.ml +++ b/src/local_package.ml @@ -131,12 +131,13 @@ module Of_sctx = struct let ctx_build_dir = Path.as_in_build_dir_exn ctx.build_dir in Super_context.packages sctx |> Package.Name.Map.map ~f:(fun (pkg : Package.t) -> + let pkg_dir = Path.Build.append_source ctx_build_dir pkg.path in let odig_files = let files = Super_context.source_files sctx ~src_path:Path.Source.root in String.Set.fold files ~init:[] ~f:(fun fn acc -> if is_odig_doc_file fn then - Path.Build.relative ctx_build_dir fn :: acc + Path.Build.relative pkg_dir fn :: acc else acc) in