Regenerated.

diff --git a/tests/Makefile.in b/tests/Makefile.in
index af7dfbf1e2237afe09cd026c444e5d17297bc821..3e49923755e8e42cdf64d6fc445e51a748b4a2c3 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -204,14 +204,22 @@ edit = sed \
        -e 's|@wrap_program[@]|$@|g' \
        -e 's|@abs_top_srcdir[@]|@abs_top_srcdir@|g' \
        -e 's|@abs_top_builddir[@]|@abs_top_builddir@|g' \
-       -e 's|@configure_input[@]|Generated from $<.|g'
+       -e "s|@configure_input[@]|Generated from $$input.|g"
 
 TESTSUITE_GENERATED_AT = \
-       aclang.at acc.at acfortran.at \
-       acgeneral.at acstatus.at \
-       acautoheader.at acautoupdate.at \
-       acspecific.at acfunctions.at acheaders.at actypes.at \
-       aclibs.at acprograms.at
+       $(srcdir)/aclang.at \
+       $(srcdir)/acc.at \
+       $(srcdir)/acfortran.at \
+       $(srcdir)/acgeneral.at \
+       $(srcdir)/acstatus.at \
+       $(srcdir)/acautoheader.at \
+       $(srcdir)/acautoupdate.at \
+       $(srcdir)/acspecific.at \
+       $(srcdir)/acfunctions.at \
+       $(srcdir)/acheaders.at \
+       $(srcdir)/actypes.at \
+       $(srcdir)/aclibs.at \
+       $(srcdir)/acprograms.at
 
 TESTSUITE_HAND_AT = \
        suite.at \
@@ -230,10 +238,10 @@ TESTSUITE = ./testsuite
 # we are allowed to use it (since we ship it).
 AUTOTEST = ./autom4te --language=autotest
 
-# The files which contains macro we check for syntax.  Don't use $(top_srcdir)
-# here since below we explicitly `cd' to $srcdir.  As for the dependencies,
-# thanks God for VPATH.  Hm...
-autoconfdir = ../lib/autoconf
+# The files which contains macro we check for syntax.  Use $(top_srcdir)
+# for the benefit of non-GNU make.  Fix the names in the rule below
+# where we `cd' to $srcdir.
+autoconfdir = $(top_srcdir)/lib/autoconf
 AUTOCONF_FILES = $(autoconfdir)/general.m4 \
                 $(autoconfdir)/status.m4 \
                 $(autoconfdir)/autoheader.m4 \
@@ -245,7 +253,7 @@ AUTOCONF_FILES = $(autoconfdir)/general.m4 \
                 $(autoconfdir)/fortran.m4 \
                 $(autoconfdir)/headers.m4 \
                 $(autoconfdir)/libs.m4 \
-                $(autoconfdir)/types.m4        \
+                $(autoconfdir)/types.m4 \
                 $(autoconfdir)/programs.m4
 
 all: all-am
@@ -292,7 +300,7 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-       $(mkdir_p) $(distdir)/../lib
+       $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/../lib
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
        list='$(DISTFILES)'; for file in $$list; do \
@@ -456,6 +464,7 @@ wrapper.in: $(srcdir)/wrapper.as $(m4sh_m4f_dependencies)
 
 $(wrappers): wrapper.in
        rm -f $@ $@.tmp
+       input=wrapper.in; \
        $(edit) wrapper.in >$@.tmp
        chmod +x $@.tmp
        chmod a-w $@.tmp
@@ -484,7 +493,8 @@ installcheck-local: atconfig atlocal $(TESTSUITE)
        $(SHELL) $(TESTSUITE) AUTOTEST_PATH="$(bindir)" $(TESTSUITEFLAGS)
 
 $(TESTSUITE_GENERATED_AT): mktests.sh $(AUTOCONF_FILES)
-       cd $(srcdir) && ./mktests.sh $(AUTOCONF_FILES)
+       cd $(srcdir) && ./mktests.sh \
+         `echo " "$(AUTOCONF_FILES) | sed 's, [^ ]*/, ../lib/autoconf/,g'`
 
 maintainer-check: maintainer-check-posix maintainer-check-c++
 expr: