From 9514c7dbf5a2691603a916d11ab38a34d600e501 Mon Sep 17 00:00:00 2001
From: Martin Bodin
Date: Fri, 22 May 2020 10:53:19 +0100
Subject: Promoting COQLIBINSTALL and COQDOCINSTALL in coq_makefile to the
 parameters section.

---
 doc/sphinx/practical-tools/utilities.rst | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'doc')

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**
 
-- 
cgit v1.2.3


From 4bdfeb3c6d3a90fe2980a6d9063bb00136c53eeb Mon Sep 17 00:00:00 2001
From: Martin Bodin
Date: Tue, 26 May 2020 16:44:05 +0100
Subject: Adding changelog.

---
 doc/changelog/08-tools/12389-coq_makefile.rst | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/changelog/08-tools/12389-coq_makefile.rst

(limited to 'doc')

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).
-- 
cgit v1.2.3