patch from Matt for automake 1.5