From d53ba17d1761261593c598b6a88cfd6ce0eb3514 Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Sat, 12 Nov 2016 03:08:56 +0100
Subject: 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.
---
 lib/envars.ml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/envars.ml b/lib/envars.ml
index 989a18db99..b71a3f6297 100644
--- a/lib/envars.ml
+++ b/lib/envars.ml
@@ -110,11 +110,8 @@ let guess_coqlib fail =
   let dir = if Coq_config.arch_is_win32 then "lib" else "lib/coq" in
   check_file_else ~dir ~file:prelude
     (fun () ->
-      let coqlib = match Coq_config.coqlib with
-        | Some coqlib -> coqlib
-        | None -> coqroot
-      in
-      if Sys.file_exists (coqlib / prelude) then coqlib
+      if not Coq_config.local && Sys.file_exists (Coq_config.coqlib / prelude)
+      then Coq_config.coqlib
       else
         fail "cannot guess a path for Coq libraries; please use -coqlib option")
 
-- 
cgit v1.2.3