consistently use %{make}% instead of "make" in opam invocations.

I'm testing this in the staging tree, so don't merge yet.