aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/changelog/08-tools/11068-coqbin-noslash.rst3
-rw-r--r--tools/CoqMakefile.in5
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/changelog/08-tools/11068-coqbin-noslash.rst b/doc/changelog/08-tools/11068-coqbin-noslash.rst
new file mode 100644
index 0000000000..c2c8f4df31
--- /dev/null
+++ b/doc/changelog/08-tools/11068-coqbin-noslash.rst
@@ -0,0 +1,3 @@
+- ``coq_makefile`` now supports environment variable ``COQBIN`` with
+ no ending ``/`` character (`#11068
+ <https://github.com/coq/coq/pull/11068>`_, by Gaƫtan Gilbert).
diff --git a/tools/CoqMakefile.in b/tools/CoqMakefile.in
index abfbd66e28..27f9a0f8c6 100644
--- a/tools/CoqMakefile.in
+++ b/tools/CoqMakefile.in
@@ -78,6 +78,11 @@ else
STDTIME?=command time -f $(TIMEFMT)
endif
+ifneq (,$(COQBIN))
+# add an ending /
+COQBIN:=$(COQBIN)/
+endif
+
# Coq binaries
COQC ?= "$(COQBIN)coqc"
COQTOP ?= "$(COQBIN)coqtop"