Index: /lang/objective-cplusplus/i3/trunk/unix/tests/Makefile.am
===================================================================
--- /lang/objective-cplusplus/i3/trunk/unix/tests/Makefile.am (revision 37221)
+++ /lang/objective-cplusplus/i3/trunk/unix/tests/Makefile.am (revision 37227)
@@ -1,9 +1,24 @@
-EXTRA_DIST = testsuite.at $(TESTSUITE) atlocal.in
+#http://www.gnu.org/software/autoconf/manual/html_node/Making-testsuite-Scripts.html
+
+# The `:;' works around a Bash 3.2 bug when the output is not writeable.
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac
+	:;{ \
+          echo '# Signature of the current package.' && \
+          echo 'm4_define([AT_PACKAGE_NAME],' && \
+          echo '  [@PACKAGE_NAME@])' && \
+          echo 'm4_define([AT_PACKAGE_TARNAME],' && \
+          echo '  [@PACKAGE_TARNAME@])' && \
+          echo 'm4_define([AT_PACKAGE_VERSION],' && \
+          echo '  [@PACKAGE_VERSION@])' && \
+          echo 'm4_define([AT_PACKAGE_STRING],' && \
+          echo '  [@PACKAGE_STRING@])' && \
+          echo 'm4_define([AT_PACKAGE_BUGREPORT],' && \
+          echo '  [@PACKAGE_BUGREPORT@])'; \
+          echo 'm4_define([AT_PACKAGE_URL],' && \
+          echo '  [@PACKAGE_URL@])'; \
+        } >'$(srcdir)/package.m4'
+
+EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE) atlocal.in
 TESTSUITE = $(srcdir)/testsuite
-AUTOM4TE = autom4te
-DISTCLEANFILES = $(top_builddir)/i3_test$(EXEEXT) $(top_builddir)/mil_test$(EXEEXT)
-
-atconfig: $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) config.status
 
 check-local: atconfig atlocal $(TESTSUITE)
@@ -11,28 +26,13 @@
 
 installcheck-local: atconfig atlocal $(TESTSUITE)
-	$(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \
-          $(TESTSUITEFLAGS)
+	$(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' $(TESTSUITEFLAGS)
 
 clean-local:
-	test ! -f '$(TESTSUITE)' || \
-	$(SHELL) '$(TESTSUITE)' --clean
-	rm -f atconfig
+	test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' --clean
 
+AUTOM4TE = $(SHELL) $(srcdir)/build-aux/missing --run autom4te
 AUTOTEST = $(AUTOM4TE) --language=autotest
-
 $(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4
 	$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
 	mv $@.tmp $@
 
-# The `:;' works around a Bash 3.2 bug when the output is not writeable.
-$(srcdir)/package.m4: $(top_srcdir)/configure.ac
-	:;{ \
-          echo '# Signature of the current package.' && \
-          echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])' && \
-          echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])' && \
-          echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])' && \
-          echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])' && \
-          echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])' && \
-          echo ; \
-        } >'$(srcdir)/package.m4'
-