diff options
author | Stephane Glondu <steph@glondu.net> | 2009-02-19 13:13:20 +0100 |
---|---|---|
committer | Stephane Glondu <steph@glondu.net> | 2009-02-19 13:13:20 +0100 |
commit | 2155252cd74c3a2d0dc0bde716ef70b1f86b8085 (patch) | |
tree | 20313deb80e22ea9088f1e6ba0bb9336f3718b25 /lib/envars.ml | |
parent | 06746919eadeeb430bfb464d83847f982ea78540 (diff) | |
parent | a0a94c1340a63cdb824507b973393882666ba52a (diff) |
Merge commit 'upstream/8.2-1+dfsg'
Diffstat (limited to 'lib/envars.ml')
-rw-r--r-- | lib/envars.ml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/envars.ml b/lib/envars.ml index 5887adcd..d700ffe1 100644 --- a/lib/envars.ml +++ b/lib/envars.ml @@ -21,8 +21,9 @@ let guess_coqlib () = else 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 + let rpath = if Coq_config.local then [] else + (if Coq_config.arch = "win32" then ["lib"] else ["lib";"coq"]) in + let coqlib = List.fold_left Filename.concat prefix rpath in if Sys.file_exists (Filename.concat coqlib file) then coqlib else Util.error "cannot guess a path for Coq libraries; please use -coqlib option" |