diff options
| author |  Jason Gross <jasongross9@gmail.com> | 2017-06-28 01:04:41 -0400 |
|---|---|---|
| committer |  Jason Gross <jgross@mit.edu> | 2017-06-30 13:17:43 -0400 |
| commit | e7bc719df55907b00b04f9fa2d45dba2da838360 (patch) | |
| tree | c8e9e4dcaeeaaa791a4e4e340f0fe3e1e9402a59 | |
| parent | 35e0f327405fb659c7ec5f9f7d26ea284aa45810 (diff) | |
Quote $(OCAMLFIND) in CoqMakefile.in for Windows
This, I hope, will fix [bug #5620](https://coq.inria.fr/bugs/show_bug.cgi?id=5620)
| -rw-r--r-- | tools/CoqMakefile.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/CoqMakefile.in b/tools/CoqMakefile.in index 7b01c1b66..29e2a89e3 100644 --- a/tools/CoqMakefile.in +++ b/tools/CoqMakefile.in @@ -73,11 +73,11 @@ COQDOC ?= "$(COQBIN)coqdoc" COQMKTOP ?= "$(COQBIN)coqmktop" # OCaml binaries -CAMLC ?= $(OCAMLFIND) ocamlc -c -rectypes -thread -CAMLOPTC ?= $(OCAMLFIND) opt -c -rectypes -thread -CAMLLINK ?= $(OCAMLFIND) ocamlc -rectypes -thread -CAMLOPTLINK ?= $(OCAMLFIND) opt -rectypes -thread -CAMLDEP ?= $(OCAMLFIND) ocamldep -slash -ml-synonym .ml4 -ml-synonym .mlpack +CAMLC ?= "$(OCAMLFIND)" ocamlc -c -rectypes -thread +CAMLOPTC ?= "$(OCAMLFIND)" opt -c -rectypes -thread +CAMLLINK ?= "$(OCAMLFIND)" ocamlc -rectypes -thread +CAMLOPTLINK ?= "$(OCAMLFIND)" opt -rectypes -thread +CAMLDEP ?= "$(OCAMLFIND)" ocamldep -slash -ml-synonym .ml4 -ml-synonym .mlpack # DESTDIR is prepended to all installation paths DESTDIR ?= @@ -139,7 +139,7 @@ COQSRCLIBS?= $(foreach d,$(COQ_SRC_SUBDIRS), -I "$(COQLIB)$(d)") CAMLFLAGS=$(OCAMLLIBS) $(COQSRCLIBS) -I $(CAMLP4LIB) -CAMLLIB:=$(shell $(OCAMLFIND) printconf stdlib) +CAMLLIB:=$(shell "$(OCAMLFIND)" printconf stdlib) # FIXME This should be generated by Coq GRAMMARS:=grammar.cma @@ -308,12 +308,12 @@ html: $(GLOBFILES) $(VFILES) mlihtml: $(MLIFILES:.mli=.cmi) $(SHOW)'OCAMLDOC -d $@' $(HIDE)mkdir $@ || rm -rf $@/* - $(HIDE)$(OCAMLFIND) ocamldoc -html -rectypes \ + $(HIDE)"$(OCAMLFIND)" ocamldoc -html -rectypes \ -d $@ -m A $(CAMLDEBUG) $(CAMLFLAGS) $(MLIFILES) all-mli.tex: $(MLIFILES:.mli=.cmi) $(SHOW)'OCAMLDOC -latex $@' - $(OCAMLFIND) ocamldoc -latex -rectypes \ + "$(OCAMLFIND)" ocamldoc -latex -rectypes \ -o $@ -m A $(CAMLDEBUG) $(CAMLFLAGS) $(MLIFILES) gallina: $(GFILES) |