X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2FMakefile.defs.in;h=d7a7620d5949bcfd9eb6cac398a823ad8843ec79;hb=df7a2aa19e98dc28e7f22129275a175cead49e2d;hp=ff882055b0b9a378846c7eb780c3850233eba3fc;hpb=f5e08781241c4ad7c47ab75cb24c3f1865617405;p=helm.git

diff --git a/helm/software/Makefile.defs.in b/helm/software/Makefile.defs.in
index ff882055b..d7a7620d5 100644
--- a/helm/software/Makefile.defs.in
+++ b/helm/software/Makefile.defs.in
@@ -1,8 +1,13 @@
+ifeq ($(origin OCAMLPATH), undefined)
 OCAMLFIND = OCAMLPATH=@OCAMLPATH@ @OCAMLFIND@
-CAMLP4O = @CAMLP4O@
+else
+OCAMLFIND = @OCAMLFIND@
+endif
+CAMLP5O = @CAMLP5O@
 LABLGLADECC = @LABLGLADECC@
 HAVE_OCAMLOPT = @HAVE_OCAMLOPT@
 DISTRIBUTED = @DISTRIBUTED@
+ANNOT = @ANNOT@
 
 MATITA_REQUIRES = @FINDLIB_REQUIRES@
 MATITA_CREQUIRES = @FINDLIB_CREQUIRES@