diff options
| author | Enrico Tassi | 2020-05-27 22:00:00 +0200 |
|---|---|---|
| committer | Enrico Tassi | 2020-05-27 22:00:00 +0200 |
| commit | a102a80d886bafc75991a446d1c1ae4c04494666 (patch) | |
| tree | cb1070f44e52a101c68f6f33179fcb95812e6610 /doc | |
| parent | 35e175710795974a4a38c8a7d6da6a5ccaf8de74 (diff) | |
| parent | 4bdfeb3c6d3a90fe2980a6d9063bb00136c53eeb (diff) | |
Merge PR #12389: Small coq_makefile improvement.
Reviewed-by: gares
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/changelog/08-tools/12389-coq_makefile.rst | 5 | ||||
| -rw-r--r-- | doc/sphinx/practical-tools/utilities.rst | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/doc/changelog/08-tools/12389-coq_makefile.rst b/doc/changelog/08-tools/12389-coq_makefile.rst new file mode 100644 index 0000000000..74e3a68170 --- /dev/null +++ b/doc/changelog/08-tools/12389-coq_makefile.rst @@ -0,0 +1,5 @@ +- **Changed:** + Adding the possibility in coq_makefile to directly set the installation folders, + through the :n:`COQLIBINSTALL` and :n:`COQDOCINSTALL` variables. + See :ref:`coqmakefilelocal`. + (`#12389 <https://github.com/coq/coq/pull/12389>`_, by Martin Bodin, review of Enrico Tassi). diff --git a/doc/sphinx/practical-tools/utilities.rst b/doc/sphinx/practical-tools/utilities.rst index 408f8fc3ec..33ebbce640 100644 --- a/doc/sphinx/practical-tools/utilities.rst +++ b/doc/sphinx/practical-tools/utilities.rst @@ -170,6 +170,10 @@ Here we describe only few of them. override the flags passed to ``coqdoc``. By default ``-interpolate -utf8``. :COQDOCEXTRAFLAGS: extend the flags passed to ``coqdoc`` +:COQLIBINSTALL, COQDOCINSTALL: + specify where the Coq libraries and documentation will be installed. + By default a combination of ``$(DESTDIR)`` (if defined) with + ``$(COQLIB)/user-contrib`` and ``$(DOCDIR)/user-contrib``. **Rule extension** |