Update Makefile to new version of automake.
Always report an error when combining --info and --batch.

Before we wouldn't always report an error. Frank Dana report.