Rebuilt.

3 files changed, 62 insertions, 6 deletions

diff --git a/Makefile.in b/Makefile.in
index 0cf8b24ca..5f62be3f8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -73,14 +73,22 @@ SUBDIRS = . m4 tests
 bin_SCRIPTS = automake aclocal
 info_TEXINFOS = automake.texi
 
-amfiles = clean-hdr.am clean-kr.am clean.am comp-vars.am compile.am data-clean.am data.am dejagnu.am depend.am depend2.am dist-vars.am footer.am header-vars.am header.am java-clean.am java.am kr-extra.am library.am libs-clean.am libs.am libtool.am lisp-clean.am lisp.am ltlib-clean.am ltlib.am ltlibrary.am mans-vars.am mans.am multilib.am program.am progs-clean.am progs.am remake-hdr.am remake.am scripts.am subdirs.am tags-clean.am tags.am texi-vers.am texinfos.am
+amfiles = clean-hdr.am clean-kr.am clean.am comp-vars.am compile.am \
+data-clean.am data.am dejagnu.am depend.am depend2.am dist-vars.am \
+footer.am header-vars.am header.am java-clean.am java.am kr-extra.am \
+library.am libs-clean.am libs.am libtool.am lisp-clean.am lisp.am \
+ltlib-clean.am ltlib.am ltlibrary.am mans-vars.am mans.am multilib.am \
+program.am progs-clean.am progs.am remake-hdr.am remake.am scripts.am \
+subdirs.am tags-clean.am tags.am texi-vers.am texinfos.am
 
 
-dist_pkgdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 $(amfiles)
+dist_pkgdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 \
+$(amfiles)
 
 
 scriptdir = $(pkgdatadir)
-dist_script_DATA = config.guess config.sub install-sh mdate-sh missing mkinstalldirs elisp-comp ylwrap acinstall
+dist_script_DATA = config.guess config.sub install-sh mdate-sh missing \
+mkinstalldirs elisp-comp ylwrap acinstall
 
 
 ETAGS_ARGS = $(amfiles)
@@ -460,6 +468,11 @@ distdir: $(DISTFILES)
 	-rm -rf $(distdir)
 	mkdir $(distdir)
 	-chmod 777 $(distdir)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/m4/Makefile.in b/m4/Makefile.in
index ca3dd9320..c285506d9 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -69,7 +69,10 @@ AUTOMAKE_OPTIONS = gnits
 MAINT_CHARSET = latin1
 
 m4datadir = $(datadir)/aclocal
-m4data_DATA = ccstdc.m4 cond.m4 dmalloc.m4 error.m4 header.m4 init.m4 lex.m4 lispdir.m4 maintainer.m4 missing.m4 mktime.m4 multi.m4 obstack.m4 protos.m4 ptrdiff.m4 regex.m4 sanity.m4 strtod.m4 termios.m4 winsz.m4
+m4data_DATA = ccstdc.m4 cond.m4 dmalloc.m4 error.m4 header.m4 init.m4 \
+lex.m4 lispdir.m4 maintainer.m4 missing.m4 mktime.m4 multi.m4 \
+obstack.m4 protos.m4 ptrdiff.m4 regex.m4 sanity.m4 strtod.m4 \
+termios.m4 winsz.m4
 
 
 EXTRA_DIST = $(m4data_DATA)
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 28ccffdf1..8a878da9c 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -68,7 +68,46 @@ VERSION = @VERSION@
 AUTOMAKE_OPTIONS = gnits
 
 XFAIL_TESTS = confh.test
-TESTS = acinclude.test aclocal.test aclocali.test aclocalii.test acoutnoq.test acoutput.test acoutqnl.test acouttbs.test acsilent.test all.test alpha.test ammissing.test ansi.test ansi2.test ansi3.test auxdir.test backsl.test badline.test badprog.test block.test canon.test canon2.test canon3.test canon4.test checkall.test clean.test colneq.test colneq2.test colon.test colon2.test colon3.test colon4.test colon5.test colon6.test colon7.test comment.test comment2.test compile_f_c_cxx.test cond.test cond2.test cond3.test cond4.test cond5.test cond6.test cond7.test condman.test condman2.test conf2.test confdist.test confh.test confh2.test confh3.test config.test confincl.test confsub.test confvar.test confvar2.test copy.test cxxcpp.test cxxlibobj.test cxxlink.test cxxnoc.test cxxo.test cygwin32.test defun.test defun2.test dejagnu.test depacl.test depacl2.test depend.test depend2.test depend3.test discover.test distdir.test dup.test dup2.test else.test empty.test error.test exdir.test exdir2.test exsource.test ext.test extra.test extra3.test extra4.test flibs.test fnoc.test fo.test fonly.test	fpinst2.test fpinstall.test gnits.test implicit.test include.test info.test insh.test insh2.test install.test installsh.test instdata.test instexec.test insthook.test instman.test interp.test interp2.test java.test javaprim.test javasubst.test ldadd.test lex.test lex2.test lex3.test libobj.test libobj2.test libobj3.test libobj4.test libobj5.test libobj6.test libobj7.test libobj8.test libobj9.test library.test link_c_cxx.test link_f_c.test	link_f_c_cxx.test link_f_cxx.test link_f_only.test lisp.test mclean.test mdate.test mdate2.test mdate3.test mkinst2.test mkinstall.test nodep.test noinst.test number.test objc.test obsolete.test obsolete2.test order.test outdir.test output.test	output2.test output3.test output4.test output5.test package.test parse.test pluseq.test pluseq2.test pluseq3.test pluseq4.test pluseq5.test pluseq6.test pluseq7.test ppf77.test prefix.test primary.test primary2.test proginst.test ranlib.test recurs.test recurs2.test remake.test remake2.test req.test rulepat.test scripts.test seenc.test sinclude.test spell.test spell2.test spell3.test spelling.test stamph.test stdlib.test subdir.test subdir2.test subdir3.test subst.test symlink.test syntax.test tags.test tagsub.test target.test texinfo.test texinfo2.test texinfo3.test texinfo4.test texinfo5.test texinfo6.test texinfo7.test unused.test version.test version2.test version3.test vpath.test	vtexi.test vtexi2.test whoami.test xsource.test yacc.test yaccpp.test
+TESTS = acinclude.test aclocal.test aclocali.test aclocalii.test \
+acoutnoq.test acoutput.test acoutqnl.test acouttbs.test acsilent.test \
+all.test alpha.test ammissing.test ansi.test ansi2.test ansi3.test \
+auxdir.test backsl.test badline.test badprog.test block.test \
+canon.test canon2.test canon3.test canon4.test checkall.test \
+clean.test colneq.test colneq2.test colon.test colon2.test colon3.test \
+colon4.test colon5.test colon6.test colon7.test comment.test \
+comment2.test compile_f_c_cxx.test cond.test cond2.test cond3.test \
+cond4.test cond5.test cond6.test cond7.test condman.test condman2.test \
+conf2.test confdist.test confh.test confh2.test confh3.test \
+config.test confincl.test confsub.test confvar.test confvar2.test \
+copy.test cxxcpp.test cxxlibobj.test cxxlink.test cxxnoc.test \
+cxxo.test cygwin32.test defun.test defun2.test dejagnu.test \
+depacl.test depacl2.test depend.test depend2.test depend3.test \
+discover.test distdir.test dup.test dup2.test else.test empty.test \
+error.test exdir.test exdir2.test exsource.test ext.test extra.test \
+extra3.test extra4.test flibs.test fnoc.test fo.test fonly.test	\
+fpinst2.test fpinstall.test gnits.test implicit.test include.test \
+info.test insh.test insh2.test install.test installsh.test \
+instdata.test instexec.test insthook.test instman.test interp.test \
+interp2.test java.test javaprim.test javasubst.test ldadd.test \
+lex.test lex2.test lex3.test libobj.test libobj2.test libobj3.test \
+libobj4.test libobj5.test libobj6.test libobj7.test libobj8.test \
+libobj9.test library.test link_c_cxx.test link_f_c.test	\
+link_f_c_cxx.test link_f_cxx.test link_f_only.test lisp.test \
+mclean.test mdate.test mdate2.test mdate3.test mkinst2.test \
+mkinstall.test nodep.test noinst.test number.test objc.test \
+obsolete.test obsolete2.test order.test outdir.test output.test	\
+output2.test output3.test output4.test output5.test package.test \
+parse.test pluseq.test pluseq2.test pluseq3.test pluseq4.test \
+pluseq5.test pluseq6.test pluseq7.test ppf77.test prefix.test \
+primary.test primary2.test proginst.test ranlib.test recurs.test \
+recurs2.test remake.test remake2.test req.test rulepat.test \
+scripts.test seenc.test sinclude.test spell.test spell2.test \
+spell3.test spelling.test stamph.test stdlib.test subdir.test \
+subdir2.test subdir3.test subst.test symlink.test syntax.test \
+tags.test tagsub.test target.test texinfo.test texinfo2.test \
+texinfo3.test texinfo4.test texinfo5.test texinfo6.test texinfo7.test \
+unused.test version.test version2.test version3.test vpath.test	\
+vtexi.test vtexi2.test whoami.test xsource.test yacc.test yaccpp.test
 
 
 EXTRA_DIST = defs $(TESTS)
@@ -117,7 +156,8 @@ check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
 	for tst in $(TESTS); do \
-	  if test -f $$tst; then dir=; \
+	  if test -f ./$$tst; then dir=./; \
+	  elif test -f $$tst; then dir=; \
 	  else dir="$(srcdir)/"; fi; \
 	  if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	    all=`expr $$all + 1`; \