Revert part of revision 115992 and fix the VCSWITNESS thingy.

 Makefile.in (src): Fix the computation of $vcswitness.
Fix last commit.
Remove ChangeLog entry of a reverted commit in Makefile.in.