From 58935ddbaf6f0e2470716d30f70ea18a9f8151c4 Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Sat, 12 Nov 2016 03:08:34 +0100
Subject: Exporting the suffixes needed to build coqlib, docdir, etc.

This allows to centralize in the configuration file the description of
the 3 possible installation layouts (dispatched over directories
shared by multiple application as in unix, self-contained style like
in windows, local non-installation as with option -local).

Also supporting relocalisation when -prefix or -libdir and co is given.
---
 tools/coqdoc/cdglobals.ml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'tools')

diff --git a/tools/coqdoc/cdglobals.ml b/tools/coqdoc/cdglobals.ml
index 4b5c5d2e53..a1987387f3 100644
--- a/tools/coqdoc/cdglobals.ml
+++ b/tools/coqdoc/cdglobals.ml
@@ -79,12 +79,7 @@ let guess_coqlib () =
   else
     let coqbin = normalize_path (Filename.dirname Sys.executable_name) in
     let prefix = Filename.dirname coqbin in
-    let rpath =
-      if Coq_config.local then []
-      else if Coq_config.arch_is_win32 then ["lib"]
-      else ["lib/coq"]
-    in
-    let coqlib = List.fold_left (/) prefix rpath in
+    let coqlib = prefix / Coq_config.coqlibsuffix in
     if Sys.file_exists (coqlib / file) then coqlib
     else prefix
 
-- 
cgit v1.2.3