Reset Makefile to trunk version.