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

diff --git a/helm/software/Makefile.defs.in b/helm/software/Makefile.defs.in
index cddf43c2c..d7a7620d5 100644
--- a/helm/software/Makefile.defs.in
+++ b/helm/software/Makefile.defs.in
@@ -1,13 +1,19 @@
+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@
 
 MATITA_VERSION = @MATITA_VERSION@
 
+SRCROOT = @SRCROOT@
 RT_BASE_DIR = @RT_BASE_DIR@
 DBHOST = @DBHOST@