From 05db464aefe90ff69ea69d5ce7c4775c6a7f218f Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Wed, 28 Jun 2017 12:20:47 -0400 Subject: Create a variable for CAMLDOC in CoqMakefile.in --- tools/CoqMakefile.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/CoqMakefile.in b/tools/CoqMakefile.in index 29e2a89e38..4f967e6336 100644 --- a/tools/CoqMakefile.in +++ b/tools/CoqMakefile.in @@ -77,6 +77,7 @@ CAMLC ?= "$(OCAMLFIND)" ocamlc -c -rectypes -thread CAMLOPTC ?= "$(OCAMLFIND)" opt -c -rectypes -thread CAMLLINK ?= "$(OCAMLFIND)" ocamlc -rectypes -thread CAMLOPTLINK ?= "$(OCAMLFIND)" opt -rectypes -thread +CAMLDOC ?= "$(OCAMLFIND)" ocamldoc -rectypes CAMLDEP ?= "$(OCAMLFIND)" ocamldep -slash -ml-synonym .ml4 -ml-synonym .mlpack # DESTDIR is prepended to all installation paths @@ -306,14 +307,14 @@ html: $(GLOBFILES) $(VFILES) -toc $(COQDOCFLAGS) -html $(GAL) $(COQDOCLIBS) -d html $(VFILES) mlihtml: $(MLIFILES:.mli=.cmi) - $(SHOW)'OCAMLDOC -d $@' + $(SHOW)'CAMLDOC -d $@' $(HIDE)mkdir $@ || rm -rf $@/* - $(HIDE)"$(OCAMLFIND)" ocamldoc -html -rectypes \ + $(HIDE)$(CAMLDOC) -html \ -d $@ -m A $(CAMLDEBUG) $(CAMLFLAGS) $(MLIFILES) all-mli.tex: $(MLIFILES:.mli=.cmi) - $(SHOW)'OCAMLDOC -latex $@' - "$(OCAMLFIND)" ocamldoc -latex -rectypes \ + $(SHOW)'CAMLDOC -latex $@' + $(HIDE)$(CAMLDOC) -latex \ -o $@ -m A $(CAMLDEBUG) $(CAMLFLAGS) $(MLIFILES) gallina: $(GFILES) -- cgit v1.2.3