Update make version to check for git.

This will prevent the version from being set to null if git isn't in the
path.

Fixes #6815
I'm not convinced about this - it just gets hung up waiting for the build process to exit so it doesn't display "Press enter to continue" either. This problem doesn't happen at all for some of the commands.