diff options
| author | Enrico Tassi | 2019-11-20 08:39:23 +0100 |
|---|---|---|
| committer | Enrico Tassi | 2019-11-20 08:39:23 +0100 |
| commit | f37db0ff9b59720bb80433dff2995862550aec50 (patch) | |
| tree | 48f68bbbea5f061a03a28698bf07258c9f6a7a15 | |
| parent | 5d10145531b2920f5e7b9d47bc15b5de06783d97 (diff) | |
| parent | 2f7cf5ae0c22bc802f75cccbd863be2c23630496 (diff) | |
Merge PR #11068: coq_makefile: support COQBIN with no ending /
Reviewed-by: gares
| -rw-r--r-- | doc/changelog/08-tools/11068-coqbin-noslash.rst | 3 | ||||
| -rw-r--r-- | tools/CoqMakefile.in | 5 |
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 ea93b369ee..fa186af13a 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" |