From 52f1f14a0848b3f7d4e40d28e6b35e2542cb34bc Mon Sep 17 00:00:00 2001
From: Louis Gesbert <louis.gesbert@ocamlpro.com>
Date: Wed, 26 Jun 2024 17:50:04 +0200
Subject: [PATCH] Fix for opam 2.1.6

The fix for the annoying bug with --assume-built has not been backported from
the 2.2 branch.
---
 Makefile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index b6dbd75e..ea06ac9b 100644
--- a/Makefile
+++ b/Makefile
@@ -99,14 +99,13 @@ prepare-install:
 	dune build @install --promote-install-files
 
 install: prepare-install
-	if [ x$$($(OPAM) --version) = "x2.1.5" ]; then \
-	  $(OPAM) install . --working-dir; \
-	else \
-	  $(OPAM) install . --working-dir --assume-built; \
-	fi
+	case x$$($(OPAM) --version) in \
+	  x2.1.5|x2.1.6) $(OPAM) install . --working-dir;; \
+	  *) $(OPAM) install . --working-dir --assume-built;; \
+	esac
 # `dune install` would work, but does a dirty install to the opam prefix without
 # registering with opam.
-# --assume-built is broken in 2.1.5
+# --assume-built is broken in 2.1.5 and 2.1.6
 
 inst: prepare-install
 	@opam custom-install \