diff options
| author |  Pierre Boutillier <pierre.boutillier@ens-lyon.org> | 2015-06-22 11:38:29 +0200 |
|---|---|---|
| committer | Pierre Boutillier <pierre.boutillier@ens-lyon.org> | 2015-06-22 11:38:48 +0200 |
| commit | 07e8eede6670a256a81d9d70133ebbeb64f45fe3 (patch) | |
| tree | 4583b6458ea3a649f3ddb072340b8aa5f24feb40 | |
| parent | 6d351cb0e30700f7d4f719ab8d56b9728188ae23 (diff) | |
Fixup last commit
| -rw-r--r-- | INSTALL | 4 | ||||
| -rw-r--r-- | lib/envars.ml | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -32,8 +32,8 @@ WHAT DO YOU NEED ? - Objective Caml version 3.12.1 or later (available at http://caml.inria.fr/) - - Findlib (included in OCaml binary distribution under windows and - probably available in your distribution and at + - Findlib (included in OCaml binary distribution under windows, + probably available in your distribution and for sure at http://projects.camlcity.org/projects/findlib.html) diff --git a/lib/envars.ml b/lib/envars.ml index 1cb140b94..315d28ceb 100644 --- a/lib/envars.ml +++ b/lib/envars.ml @@ -156,16 +156,16 @@ let coqpath = let exe s = s ^ Coq_config.exec_extension -let guess_ocamlfind () = fst (which (user_path ()) (exe "ocamlfind")) +let guess_ocamlfind () = which (user_path ()) (exe "ocamlfind") let ocamlfind () = if !Flags.ocamlfind_spec then !Flags.ocamlfind else if !Flags.boot then Coq_config.ocamlfind else - try guess_ocamlfind () with Not_found -> Coq_config.ocamlfind + try guess_ocamlfind () / "ocamlfind" with Not_found -> Coq_config.ocamlfind (** {2 Camlp4 paths} *) -let guess_camlp4bin () = snd (which (user_path ()) (exe Coq_config.camlp4)) +let guess_camlp4bin () = which (user_path ()) (exe Coq_config.camlp4) let camlp4bin () = if !Flags.camlp4bin_spec then !Flags.camlp4bin else |