diff options
| author |  Hugo Herbelin <Hugo.Herbelin@inria.fr> | 2016-11-10 20:27:27 +0100 |
|---|---|---|
| committer | Hugo Herbelin <Hugo.Herbelin@inria.fr> | 2017-05-29 11:15:31 +0200 |
| commit | 96ec7b5e65f79118914b7c81e14587d0dc065cc1 (patch) | |
| tree | 6998b6515ea3495c4de0715a3b60a70f60033b3e | |
| parent | 25020ba614315ce143f657511696fb7bf5135b00 (diff) | |
Mini-renaming in configure.ml to avoid switching back and forth from
"libdir" to "COQLIBINSTALL" then "libdir", then "coqlib".
For the record, here is how installation options are named at the
current time in the different places they are used (if any):
Name in Name in Name in Name of option Name in Name of option
config/Makefile coqtop -config config/coq_config.ml in configure lib/envars.ml for coqtop/coqdep
--------------------------------------------------------------------------------------------------------
COQLIBINSTALL COQLIB coqlib -libdir coqlib -coqlib
DOCDIR DOCDIR docdir -docdir docdir
CONFIGDIR configdir -configdir
DATADIR datadir -datadir
BINDIR -bindir
MANDIR -mandir
EMACSLIB -emacslib
COQDOCDIR -coqdocdir
Note: in envars.ml, docdir and coqlib are recomputed
| -rw-r--r-- | configure.ml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ml b/configure.ml index 7af18cb85..4aca89561 100644 --- a/configure.ml +++ b/configure.ml @@ -905,7 +905,7 @@ let install_dirs = let select var = List.find (fun (v,_,_,_) -> v=var) install_dirs -let libdir = let (_,_,d,_) = select "COQLIBINSTALL" in d +let coqlib = let (_,_,d,_) = select "COQLIBINSTALL" in d let docdir = let (_,_,d,_) = select "DOCDIR" in d @@ -940,7 +940,7 @@ let config_runtime () = | _ -> let ld="CAML_LD_LIBRARY_PATH" in build_loadpath := sprintf "export %s:='%s/kernel/byterun':$(%s)" ld coqtop ld; - ["-dllib";"-lcoqrun";"-dllpath";libdir/"kernel/byterun"] + ["-dllib";"-lcoqrun";"-dllpath";coqlib/"kernel/byterun"] let vmbyteflags = config_runtime () @@ -1026,7 +1026,7 @@ let write_configml f = pr "(* %s *)\n\n" (String.concat " " (Array.to_list Sys.argv)); pr_b "local" !Prefs.local; pr "let vmbyteflags = ["; List.iter (pr "%S;") vmbyteflags; pr "]\n"; - pr_o "coqlib" (if !Prefs.local then None else Some libdir); + pr_o "coqlib" (if !Prefs.local then None else Some coqlib); pr_o "configdir" configdir; pr_o "datadir" datadir; pr_s "docdir" docdir; |