Update make version to check for git.

This will prevent the version from being set to null if git isn't in the
path.

Adds ability to also provide version string manually.

Fixes #6815
I leave it up to you, but I still experience a lock with the original code if it's "paused" and I click the close button. kind of silly but that's why I put it in.