diff --git a/Makefile b/Makefile index f023f15a1eea76c6eadd3719bda1d68ad5cba621..2623cc780af21d1d2251be80e813486ae5681604 100644 --- a/Makefile +++ b/Makefile @@ -28,16 +28,15 @@ build-dep: build-dep/opam phony @# constraints. Otherwise, `opam upgrade` may well update some packages to versions @# 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. - @# Reinstalling is needed with opam 1 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 -k path $(OPAMFLAGS) "$$BUILD_DEP_PACKAGE".dev build-dep && \ - ((! opam --version | grep "^1\." > /dev/null) || ( \ - echo "# Reinstalling build-dep package." && \ - opam reinstall $(OPAMFLAGS) "$$BUILD_DEP_PACKAGE" \ - )) + @# dependencies, but does not actually install anything itself. + @echo "# Pinning build-dep package." && \ + if opam --version | grep "^1\." -q; then \ + BUILD_DEP_PACKAGE="$$(egrep "^name:" build-dep/opam | sed 's/^name: *"\(.*\)" */\1/')" && \ + opam pin add -k path $(OPAMFLAGS) "$$BUILD_DEP_PACKAGE".dev build-dep && \ + opam reinstall $(OPAMFLAGS) "$$BUILD_DEP_PACKAGE"; \ + else \ + opam install $(OPAMFLAGS) build-dep/; \ + fi # Some files that do *not* need to be forwarded to Makefile.coq Makefile: ;