diff -r a142ec271d83 -r be20f5f6feb9 lib/scripts/getsettings --- a/lib/scripts/getsettings Mon Oct 08 12:52:28 2018 +0200 +++ b/lib/scripts/getsettings Mon Oct 08 15:42:43 2018 +0200 @@ -99,6 +99,14 @@ ML_IDENTIFIER="${ML_SYSTEM}_${ML_PLATFORM}" fi +#OCaml +if [ -z "$ISABELLE_OCAML" -a -f "$ISABELLE_OPAM_ROOT/$ISABELLE_OCAML_VERSION/bin/ocaml" ]; then + ISABELLE_OCAML="$ISABELLE_HOME/lib/Tools/ocaml" +fi +if [ -z "$ISABELLE_OCAMLC" -a -f "$ISABELLE_OPAM_ROOT/$ISABELLE_OCAML_VERSION/bin/ocamlc" ]; then + ISABELLE_OCAMLC="$ISABELLE_HOME/lib/Tools/ocamlc" +fi + #enforce JAVA_HOME if [ -d "$ISABELLE_JDK_HOME/jre" ] then