Using Coq_config.local rather than None to tell that Coq_config.coqlib is local.

This goes towards an approach where a local layout can be seen as an
installed layout.

2 files changed, 14 insertions, 20 deletions

diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml
index 78c92e68b5..8e2f75fc9c 100644
--- a/tools/coq_makefile.ml
+++ b/tools/coq_makefile.ml
@@ -119,14 +119,8 @@ let read_whole_file s =
     Buffer.contents b
 
 let makefile_template =
-  let open Filename in
   let template = "/tools/CoqMakefile.in" in
-  if Coq_config.local then
-    let coqbin = CUnix.canonical_path_name (dirname Sys.executable_name) in
-    dirname coqbin ^ template
-  else match Coq_config.coqlib with
-    | None -> assert false
-    | Some dir -> dir ^ template
+  Coq_config.coqlib ^ template
 
 let quote s = if String.contains s ' ' then "\"" ^ s ^ "\"" else s
 
diff --git a/tools/coqdoc/cdglobals.ml b/tools/coqdoc/cdglobals.ml
index 5d48473d8c..4b5c5d2e53 100644
--- a/tools/coqdoc/cdglobals.ml
+++ b/tools/coqdoc/cdglobals.ml
@@ -74,19 +74,19 @@ let normalize_filename f =
 
 let guess_coqlib () =
   let file = "theories/Init/Prelude.vo" in
-  match Coq_config.coqlib with
-    | Some coqlib when Sys.file_exists (coqlib / file) -> coqlib
-    | Some _ | None ->
-      let coqbin = normalize_path (Filename.dirname Sys.executable_name) in
-      let prefix = Filename.dirname coqbin in
-      let rpath =
-        if Coq_config.local then []
-        else if Coq_config.arch_is_win32 then ["lib"]
-        else ["lib/coq"]
-      in
-      let coqlib = List.fold_left (/) prefix rpath in
-      if Sys.file_exists (coqlib / file) then coqlib
-      else prefix
+  if not Coq_config.local && Sys.file_exists (Coq_config.coqlib / file)
+  then Coq_config.coqlib
+  else
+    let coqbin = normalize_path (Filename.dirname Sys.executable_name) in
+    let prefix = Filename.dirname coqbin in
+    let rpath =
+      if Coq_config.local then []
+      else if Coq_config.arch_is_win32 then ["lib"]
+      else ["lib/coq"]
+    in
+    let coqlib = List.fold_left (/) prefix rpath in
+    if Sys.file_exists (coqlib / file) then coqlib
+    else prefix
 
 let header_trailer = ref true
 let header_file = ref ""