diff options
| author | Hugo Herbelin | 2016-11-10 23:35:47 +0100 |
|---|---|---|
| committer | Hugo Herbelin | 2017-05-29 11:15:31 +0200 |
| commit | 5b506165097047aa8b6b431db9f2cbc8dbf6c3de (patch) | |
| tree | 42db993ebdee049de57f155d4977470c969c8f1e | |
| parent | 615047314c4e3331db09883b30c067544a03023b (diff) | |
Unifying the layout of installation directories.
There seems to have been several bugs, when -prefix is given:
- Under win32: "" instead of "lib" (presumably introduced in ab442aed8, 2006)
- Under win32: datadir, mandir, docdir should presumably be in
"share", "man", "doc", as given in default
- Under non-win32: coqdoc files should be in latex subdir not emacs subdir
| -rw-r--r-- | configure.ml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/configure.ml b/configure.ml index f95144912f..a0b0a70874 100644 --- a/configure.ml +++ b/configure.ml @@ -864,25 +864,25 @@ let install = [ "/bin"; "COQLIBINSTALL", "the Coq library", Prefs.libdir, (if unix then "/usr/local/lib/coq" else "C:/coq/lib"), - (if arch_is_win32 then "" else "/lib/coq"); + (if arch_is_win32 then "/lib" else "/lib/coq"); "CONFIGDIR", "the Coqide configuration files", Prefs.configdir, (if unix then "/etc/xdg/coq" else "C:/coq/config"), (if arch_is_win32 then "/config" else "/etc/xdg/coq"); "DATADIR", "the Coqide data files", Prefs.datadir, (if unix then "/usr/local/share/coq" else "C:/coq/share"), - "/share/coq"; + (if arch_is_win32 then "/share" else "/share/coq"); "MANDIR", "the Coq man pages", Prefs.mandir, (if unix then "/usr/local/share/man" else "C:/coq/man"), - "/share/man"; + (if arch_is_win32 then "/man" else "/share/man"); "DOCDIR", "the Coq documentation", Prefs.docdir, (if unix then "/usr/local/share/doc/coq" else "C:/coq/doc"), - "/share/doc/coq"; + (if arch_is_win32 then "/doc" else "/share/doc/coq"); "EMACSLIB", "the Coq Emacs mode", Prefs.emacslib, (if unix then "/usr/local/share/emacs/site-lisp" else "C:/coq/emacs"), (if arch_is_win32 then "/emacs" else "/share/emacs/site-lisp"); "COQDOCDIR", "the Coqdoc LaTeX files", Prefs.coqdocdir, (if unix then "/usr/local/share/texmf/tex/latex/misc" else "C:/coq/latex"), - (if arch_is_win32 then "/latex" else "/share/emacs/site-lisp"); + (if arch_is_win32 then "/latex" else "/share/texmf/tex/latex/misc"); ] let do_one_instdir (var,msg,r,dflt,suff) = |