Merge branch 'maint'

* maint:
  automake: remove an unused local variable
  distcheck: more resilient against possible failures
  cleanup: remove almost-unused global var 'am_relative_dir'

diff --cc automake.in
Simple merge

diff --cc lib/am/distdir.am
Simple merge