From cf5e95131199566f99d9a040d654e90a12134089 Mon Sep 17 00:00:00 2001
From: Anthony Scemama <scemama@irsamc.ups-tlse.fr>
Date: Mon, 6 Feb 2023 18:07:03 +0100
Subject: [PATCH] Force reinstallation of ocaml when configure -i

---
 configure | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 771d5cc4..647c4bf3 100755
--- a/configure
+++ b/configure
@@ -254,10 +254,13 @@ EOF
 
          execute <<EOF
             source "${QP_ROOT}"/quantum_package.rc
+            rm -rf "${QP_ROOT}"/external/opampack
             cd "${QP_ROOT}"/external/
             tar --gunzip --extract --file qp2-dependencies/opampack.tar.gz
             cd "${QP_ROOT}"/external/opampack
             ./install.sh
+            export OPAMROOT="${QP_ROOT}"/external/opampack/opamroot
+            eval \$("${QP_ROOT}"/external/opampack/opam env)
 EOF
 
     elif [[ ${PACKAGE} = bse ]] ; then
@@ -357,7 +360,7 @@ if [[ ${ZLIB} = $(not_found) ]] ; then
         fail
 fi
 
-OCAML=$(find_exe ocaml)
+OCAML=$(find_exe ocamlc)
 if [[ ${OCAML} = $(not_found) ]] ; then
         error "OCaml (ocaml) compiler is not installed."
         fail