Log Message:
Instead of a hack that needs to be adapted for every automake release,
use the standard tools in the standard way.