Modified Makefile.

Tried to get rid of wrong version control information from builds
not using the Makefile.
Modified Makefile II.

Made version information depending on Makefile usage work.
Previously only the first build after a commit produced the
correct output.