From 334af50107f0a91cb1713623208872a5ba73833e Mon Sep 17 00:00:00 2001
From: Kate <kit-ty-kate@outlook.com>
Date: Tue, 2 Jul 2024 19:19:51 +0100
Subject: [PATCH] release: Fix the creation of the opam-full-<version>.tar.gz
 archive (mccs was missing)

---
 master_changes.md | 2 ++
 release/Makefile  | 6 +-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/master_changes.md b/master_changes.md
index 64a9c92b24c..57d027a1bda 100644
--- a/master_changes.md
+++ b/master_changes.md
@@ -79,6 +79,8 @@ users)
 ## Infrastructure
 
 ## Release scripts
+  * Add the missing mccs archive to the opam-full-<version>.tar.gz archive [#6066 @kit-ty-kate]
+  * Ensure the configure file stays as it is in the tag, in the opam-full-<version>.tar.gz archive [#6066 @kit-ty-kate]
 
 ## Install script
   * Provide a shell/install.ps1 PowerShell script to install opam on Windows [#5906 @kit-ty-kate @dra27]
diff --git a/release/Makefile b/release/Makefile
index e55d57e48d5..dc18a76a451 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -26,11 +26,7 @@ s390x-linux: $(OUTDIR)/opam-$(VERSION)-s390x-linux
 $(OUTDIR)/opam-full-$(VERSION).tar.gz:
 	mkdir -p "$(OUTDIR)"
 	git clone $(GIT_URL) -b $(TAG) "$(OUTDIR)/opam-full-$(VERSION)"
-	sed 's/^AC_INIT(\[opam\],\[.*\])/AC_INIT([opam],[$(OPAM_VERSION)])/' "$(OUTDIR)/opam-full-$(VERSION)/configure.ac" > \
-	  "$(OUTDIR)/opam-full-$(VERSION)/configure.ac.tmp"
-	mv "$(OUTDIR)/opam-full-$(VERSION)/configure.ac.tmp" \
-	  "$(OUTDIR)/opam-full-$(VERSION)/configure.ac"
-	$(MAKE) -C "$(OUTDIR)/opam-full-$(VERSION)" OCAML=$(call pathsearch,ocaml) configure download-ext
+	$(MAKE) -C "$(OUTDIR)/opam-full-$(VERSION)" OCAML=$(call pathsearch,ocaml) MCCS_ENABLED=true download-ext
 	cd "$(OUTDIR)" && tar cz -f $(notdir $@) --exclude .git/ opam-full-$(VERSION)
 	rm -rf "$(OUTDIR)/opam-full-$(VERSION)"