Automake tweaks

Here are a few tweaks to help with building packages for distributions.