Make builds that use stage1 use "dist-install" consistently. This