* tests/extra7.test: New file. * tests/Makefile.am: Add it. * lib/am/distdir.an (distdir): When a distribuable directory exists both in `.' and $(srcdir), merge both directories. This works around a failure of extra6.test on Tru64 reported by Nicolas Joly.