* dist-vars.am: Remove, merge into... * distdir.am: this. * automake.in (dirname, basename, backname): Move at the top of the file so that prototypes are checked, Use them without `&'. (&handle_dist): Adjust.