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

diff --git a/helm/software/Makefile.defs.in b/helm/software/Makefile.defs.in
index b714a606e..d7a7620d5 100644
--- a/helm/software/Makefile.defs.in
+++ b/helm/software/Makefile.defs.in
@@ -1,12 +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@