Fix d'un problème lors de l'appel à coqtop avec un chemin relatif

(cherry picked from commit 76796fca17ec7763b1301b0dd22c07ddc92983fc)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11917 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 3 insertions, 2 deletions

diff --git a/lib/envars.ml b/lib/envars.ml
index 867297a86..5887adcde 100644
--- a/lib/envars.ml
+++ b/lib/envars.ml
@@ -12,14 +12,15 @@
 let coqbin () = 
   if !Flags.boot || Coq_config.local
   then Filename.concat Coq_config.coqsrc "bin"
-  else Filename.dirname Sys.executable_name
+  else System.canonical_path_name (Filename.dirname Sys.executable_name)
 
 let guess_coqlib () = 
   let file = "states/initial.coq" in
     if Sys.file_exists (Filename.concat Coq_config.coqlib file) 
     then Coq_config.coqlib
     else 
-      let prefix = Filename.dirname (Filename.dirname Sys.executable_name) in
+      let coqbin = System.canonical_path_name (Filename.dirname Sys.executable_name) in
+      let prefix = Filename.dirname coqbin in
       let coqlib = if Coq_config.local then prefix else 
 	List.fold_left Filename.concat prefix ["lib";"coq"] in
 	if Sys.file_exists (Filename.concat coqlib file) then coqlib else