diff --git a/install/scripts/install_ocaml.sh b/install/scripts/install_ocaml.sh index efdf0962..022cc59a 100755 --- a/install/scripts/install_ocaml.sh +++ b/install/scripts/install_ocaml.sh @@ -1,4 +1,4 @@ -#!/bin/bash -x +#!/bin/bash PACKAGES="core cryptokit ocamlfind sexplib" @@ -19,7 +19,7 @@ chmod +x ocaml.sh || exit 1 echo N | ./ocaml.sh ${QP_ROOT}/bin/ || exit 1 -${QP_ROOT}/bin/opam config setup -a|| exit 1 +${QP_ROOT}/bin/opam config setup -a -q || exit 1 export LD_LIBRARY_PATH=${QP_ROOT}/lib:${LD_LIBRARY_PATH} export LIBRARY_PATH=${QP_ROOT}/lib:${LIBRARY_PATH} diff --git a/ocaml/Makefile b/ocaml/Makefile index 9c689f56..6bf8d81b 100644 --- a/ocaml/Makefile +++ b/ocaml/Makefile @@ -62,8 +62,8 @@ qp_run.native: $(MLFILES) $(MLIFILES) executables $(OCAMLBUILD) $*.native -use-ocamlfind $(PKGS) ln -s $*.native $* -ezfio.ml: ${QP_ROOT}/EZFIO/Ocaml/ezfio.ml - cp ${QP_ROOT}/EZFIO/Ocaml/ezfio.ml . +ezfio.ml: ${QP_ROOT}/install/EZFIO/Ocaml/ezfio.ml + cp ${QP_ROOT}/install/EZFIO/Ocaml/ezfio.ml . qptypes_generator.byte: qptypes_generator.ml $(OCAMLBUILD) qptypes_generator.byte -use-ocamlfind @@ -71,8 +71,8 @@ qptypes_generator.byte: qptypes_generator.ml Qptypes.ml: qptypes_generator.byte ./qptypes_generator.byte > Qptypes.ml -${QP_ROOT}/EZFIO/Ocaml/ezfio.ml: - $(MAKE) -C ${QP_ROOT}/src ezfio +${QP_ROOT}/install/EZFIO/Ocaml/ezfio.ml: + $(MAKE) -C ${QP_ROOT}/install/src ezfio Input_auto_generated.ml qp_edit.ml: ei_handler.py ocaml_global