diff options
| author | Martin Bodin | 2020-05-26 16:44:05 +0100 |
|---|---|---|
| committer | Enrico Tassi | 2020-05-27 21:53:25 +0200 |
| commit | 4bdfeb3c6d3a90fe2980a6d9063bb00136c53eeb (patch) | |
| tree | cb1070f44e52a101c68f6f33179fcb95812e6610 | |
| parent | 9514c7dbf5a2691603a916d11ab38a34d600e501 (diff) | |
Adding changelog.
| -rw-r--r-- | doc/changelog/08-tools/12389-coq_makefile.rst | 5 | ||||
| -rw-r--r-- | tools/CoqMakefile.in | 3 |
2 files changed, 7 insertions, 1 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/tools/CoqMakefile.in b/tools/CoqMakefile.in index 8b0a37ee3c..e2ed2db728 100644 --- a/tools/CoqMakefile.in +++ b/tools/CoqMakefile.in @@ -153,7 +153,8 @@ endif # Substitution of the path by appending $(DESTDIR) if needed. # The variable $(COQMF_WINDRIVE) can be needed for Cygwin environments. -destination_path = $(if $(DESTDIR),$(DESTDIR)/$(if $(COQMF_WINDRIVE),$(subst $(COQMF_WINDRIVE),/,$(1)),$(1)),$(1)) +windrive_path = $(if $(COQMF_WINDRIVE),$(subst $(COQMF_WINDRIVE),/,$(1)),$(1)) +destination_path = $(if $(DESTDIR),$(DESTDIR)/$(call windrive_path,$(1)),$(1)) # Installation paths of libraries and documentation. COQLIBINSTALL ?= $(call destination_path,$(COQLIB)/user-contrib) |