Revised version number calculation.

This should ensure that the version number reported by the program
agrees with the version that was installed, instead of being one release
ahead of it.