When we are building from git, we put the git version info in manifest.ml, so
we'll get the following from sail -v

Sail $last_git_tag ($branch @ $commit_sha)

If we are be built from opam we can't assume we are in a git repository as
opam downloads specific tags as tarballs, so instead we check for the precense
of SHARE_DIR which is set by our opam build script, and instead output

Sail 0.8 (sail2 @ opam)

which is the next git tag (current is 0.7.1, this must be updated by hand),
the branch name from which opam releases are generated and then opam rather
than the commit SHA.

I also removed the Makefile-non-opam file as it's bitrotted and unused