From 07e8eede6670a256a81d9d70133ebbeb64f45fe3 Mon Sep 17 00:00:00 2001 From: Pierre Boutillier Date: Mon, 22 Jun 2015 11:38:29 +0200 Subject: Fixup last commit --- lib/envars.ml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/envars.ml') 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 -- cgit v1.2.3