Merge pull request #6765 from kit-ty-kate/full-archive-fix

Fix the placement of the vendored archives in the release tarball

Author: rjbou

master_changes.md

@@ -77,6 +77,7 @@ users)
 ## Infrastructure
 
 ## Release scripts
+  * Fix the placement of the vendored archives in the release tarball [#6765 @kit-ty-kate - fix #6762]
 
 ## Install script
   * Add `2.5.0~alpha1` to the installers [#6748 @kit-ty-kate]

release/Makefile

@@ -33,10 +33,10 @@ $(OUTDIR)/opam-full-$(VERSION).tar.gz:
 	( set -euo pipefail && \
 	  cd "$(OUTDIR)/opam-full-$(VERSION)" && \
 	  git archive "$(TAG)" \
-		--prefix "opam-full-$(VERSION)/" \
 		--mtime "$$(git show -s --format=%ct "$(TAG)" | tail -1)" \
 		-o "$(abspath $(OUTDIR)/opam-full-$(VERSION).tar)" \
-		$$(for f in $$(git ls-files -i -o -x '*'); do echo "--add-file=$$f" || exit 1; done) && \
+		$$(for f in $$(git ls-files -i -o -x '*'); do echo "--prefix=opam-full-$(VERSION)/$$(dirname -- $$f)/ --add-file=$$f" || exit 1; done) \
+		--prefix "opam-full-$(VERSION)/" && \
 	  gzip --no-name --best "$(abspath $(OUTDIR)/opam-full-$(VERSION).tar)" )
 	rm -rf "$(OUTDIR)/opam-full-$(VERSION)"