From 4e15fa15225fbe2c60938418b5d81b89327ec378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Dimino?= Date: Tue, 31 Jul 2018 18:06:17 +0100 Subject: [PATCH] Fix #1070 (#1072) Signed-off-by: Jeremie Dimino --- CHANGES.md | 3 +++ bin/main.ml | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index d82e1b93..4f204b94 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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) ------------------ diff --git a/bin/main.ml b/bin/main.ml index df1433f9..9f795080 100644 --- a/bin/main.ml +++ b/bin/main.ml @@ -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 = @@ -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