From e67daba3228ad79db247aa804cbc2f1493283e72 Mon Sep 17 00:00:00 2001 From: Ralf Jung <jung@mpi-sws.org> Date: Sat, 7 Oct 2017 11:03:16 +0200 Subject: [PATCH] tweak opam build-dep installation --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 83a26f56..2238350d 100644 --- a/Makefile +++ b/Makefile @@ -31,11 +31,12 @@ build-dep: build-dep/opam phony @# that are incompatible with our build requirements. @# To achieve this, we create a fake opam package that has our build-dependencies as @# dependencies, but does not actually install anything. - # Add the pin and (re)install build-dep package. - @# Reinstallation is needed in case the pin already exists, but the builddep package changed. + @# Upgrading is needed in case the pin already exists, but the builddep package changed. @BUILD_DEP_PACKAGE="$$(egrep "^name:" build-dep/opam | sed 's/^name: *"\(.*\)" */\1/')"; \ + echo "# Pinning build-dep package." && \ opam pin add "$$BUILD_DEP_PACKAGE".dev "$$(pwd)/build-dep" -k path $(OPAMFLAGS) && \ - opam reinstall "$$BUILD_DEP_PACKAGE" + echo "# Updating build-dep package." && \ + opam upgrade "$$BUILD_DEP_PACKAGE" # Some files that do *not* need to be forwarded to Makefile.coq Makefile: ; -- GitLab