we are migrating the static htnl pagest to html 4 to xhtml 1.1 + css

[helm.git] / helm / software / daemons / proofChecker / Makefile

diff --git a/helm/software/daemons/proofChecker/Makefile b/helm/software/daemons/proofChecker/Makefile
index af48d0a5d1e941ec7d45a6831a6192fdb5be17c4..0afd0a7a50f940c3db7c3b11c9952336905a03cf 100644 (file)
--- a/helm/software/daemons/proofChecker/Makefile
+++ b/helm/software/daemons/proofChecker/Makefile
@@ -1,13 +1,18 @@
 BIN_DIR = /usr/local/bin
 REQUIRES = helm-cic_proof_checking http
 PREDICATES =
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -thread
-OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS) -g
-OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
+OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -thread -rectypes
+ifeq ($(origin OCAMLPATH), undefined)
+OCAMLFIND = OCAMLPATH=../../components/METAS ocamlfind
+else
+OCAMLFIND = ocamlfind
+endif
+OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLOPTIONS) -g
+OCAMLOPT = $(OCAMLFIND) ocamlopt $(OCAMLOPTIONS)
 OCAMLDEP = ocamldep
 
-LIBRARIES = $(shell ocamlfind query -recursive -predicates "byte $(PREDICATES)" -format "%d/%a" $(REQUIRES))
-LIBRARIES_OPT = $(shell ocamlfind query -recursive -predicates "native $(PREDICATES)" -format "%d/%a" $(REQUIRES))
+LIBRARIES = $(shell $(OCAMLFIND) query -recursive -predicates "byte $(PREDICATES)" -format "%d/%a" $(REQUIRES))
+LIBRARIES_OPT = $(shell $(OCAMLFIND) query -recursive -predicates "native $(PREDICATES)" -format "%d/%a" $(REQUIRES))
 
 all: $(PROOFCHECKEROBJS) proofChecker
 opt: $(PROOFCHECKEROBJS:.cmo=.cmx) proofChecker.opt