Small tweaks to get "make distcheck" working

This uses some different paths than a typical build from a tarball or the repo