local use of OCAMLPATH so that ./script.sh should not be needed anymore

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index bbf534b325967ccee89dc0b6ce8abd00d25d4d69..1ace35ca4daf58b7044a7fdb22e563422265c1e2 100644 (file)
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -1,5 +1,6 @@
 
-OCAMLFIND = @OCAMLFIND@
+OCAMLPATH = ../ocaml/METAS/
+OCAMLFIND = OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH @OCAMLFIND@
 CAMLP4O = @CAMLP4O@
 LABLGLADECC = @LABLGLADECC@
 REQUIRES = @FINDLIB_REQUIRES@

diff --git a/helm/matita/configure.ac b/helm/matita/configure.ac
index e25e1c65c1aa7e3e029ab0c0d676ded7477e87a4..745b4dfbe847d15662939a7a57d53ff37848e66b 100644 (file)
--- a/helm/matita/configure.ac
+++ b/helm/matita/configure.ac
@@ -48,7 +48,7 @@ helm-xmldiff \
 for r in $FINDLIB_REQUIRES
 do
   AC_MSG_CHECKING(for $r ocaml library)
-  if $OCAMLFIND query $r &> /dev/null; then
+  if OCAMLPATH=../ocaml/METAS $OCAMLFIND query $r &> /dev/null; then
     AC_MSG_RESULT(yes)
   else
     AC_MSG_ERROR(could not find $r ocaml library)