mirror of
https://github.com/CatalaLang/catala.git
synced 2024-11-08 07:51:43 +03:00
Fix for opam 2.1.6
The fix for the annoying bug with --assume-built has not been backported from the 2.2 branch.
This commit is contained in:
parent
291a8e05e4
commit
52f1f14a08
11
Makefile
11
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 \
|
||||
|
Loading…
Reference in New Issue
Block a user