1 files changed, 8 insertions, 8 deletions
diff --git a/toplevel/coqinit.ml b/toplevel/coqinit.ml
index 474b247a6..33ee012cf 100644
--- a/toplevel/coqinit.ml
+++ b/toplevel/coqinit.ml
@@ -56,19 +56,19 @@ let getenv_else s dft = try Sys.getenv s with Not_found -> dft
 
 (* Initializes the LoadPath according to COQLIB and Coq_config *)
 let init_load_path () =
-  (* default load path; only if COQLIB is defined *)
-  let coqlib = getenv_else "COQLIB" Coq_config.coqlib in
-  let coqtop = getenv_else "COQTOP" Coq_config.coqtop in
-  if coqlib = coqtop then
-    (* local installation *)
+  if Coq_config.local then
+    (* local use (no installation) *)
     List.iter 
-      (fun s -> add_include (Filename.concat coqtop s))
+      (fun s -> add_include (Filename.concat Coq_config.coqtop s))
       ("states" :: "dev" ::
        (List.map 
 	  (fun s -> Filename.concat "theories" (hm2 s))
           Coq_config.theories_dirs))
-  else
-    add_include coqlib;
+  else begin
+    (* default load path; only if COQLIB is defined *)
+    let coqlib = getenv_else "COQLIB" Coq_config.coqlib in
+    add_include coqlib
+  end;
   let camlp4 = getenv_else "CAMLP4LIB" Coq_config.camlp4lib in
   add_include camlp4;
   add_include ".";