Automake 1.13 uses a different format

Two changes to support current versions of automake as they changed the format