Skip to content

Fix #1070 #1072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1 commit merged into from Jul 31, 2018
Merged

Fix #1070 #1072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ next
- Add ``enabled_if`` field for aliases and tests. This field controls whether
the test will be ran using a boolean expression language. (#819, @rgrinberg)

- Interpret `X` in `--libdir X` as relative to `PREFIX` when `X` is relative
(#1072, fix #1070, @diml)

1.0.1 (19/07/2018)
------------------

Expand Down
6 changes: 3 additions & 3 deletions bin/main.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,9 +1020,9 @@ let get_prefix context ~from_command_line =
| Some p -> Fiber.return (Path.of_string p)
| None -> Context.install_prefix context

let get_libdir context ~libdir_from_command_line =
let get_libdir context ~prefix ~libdir_from_command_line =
match libdir_from_command_line with
| Some p -> Fiber.return (Some (Path.of_string p))
| Some p -> Fiber.return (Some (Path.relative prefix p))
| None -> Context.install_ocaml_libdir context

let print_unix_error f =
Expand Down Expand Up @@ -1108,7 +1108,7 @@ let install_uninstall ~what =
~f:(fun (context, install_files) ->
get_prefix context ~from_command_line:prefix_from_command_line
>>= fun prefix ->
get_libdir context ~libdir_from_command_line
get_libdir context ~prefix ~libdir_from_command_line
>>| fun libdir ->
List.iter install_files ~f:(fun (package, path) ->
let entries = Install.load_install_file path in
Expand Down