* tests/Makefile.am (XFAIL_TESTS): Removed substtarg.test.

	* automake.in (TARGET_PATTERN): Add `@' as allowable character.

diff --git a/ChangeLog b/ChangeLog
index 8b67803..325c20f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-07-22  Tom Tromey  <tromey@redhat.com>
 
+       * tests/Makefile.am (XFAIL_TESTS): Removed substtarg.test.
+       * automake.in (TARGET_PATTERN): Add `@' as allowable character.
+
        * tests/Makefile.am (XFAIL_TESTS): Removed exeext.test.
        * automake.in (am_install_var): Add $(EXEEXT) even if program name
        holds `.'.  Don't add $(EXEEXT) if program name already has it.
@@ -26,7 +29,7 @@
 
        * tests/libtool2.test: Check for libtoolize.
 
-       * tests/Makefile.am (TESTS): Added substtart.test.
+       * tests/Makefile.am (TESTS): Added substtarg.test.
        (XFAIL_TESTS): Likewise.
        * tests/substtarg.test: New file.
 
@@ -39,7 +42,7 @@
        (XFAIL_TESTS): Likewise.
        * tests/depdist.test: New file.  From Eric Magnien.
 
-       * tests/ccnoco.test: Removed `configure.2' test; in autocon 2.50
+       * tests/ccnoco.test: Removed `configure.2' test; in autoconf 2.50
        AC_PROG_CC_C_O does require AC_PROG_CC.
 
        From Erik Lindahl:

diff --git a/automake.in b/automake.in
index 9b21517..8382205 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -133,7 +133,7 @@ my $libdir = "@datadir@/@PACKAGE@";
 my $IGNORE_PATTERN = '^\s*##([^#\n].*)?\n';
 my $WHITE_PATTERN = '^\s*$';
 my $COMMENT_PATTERN = '^#';
-my $TARGET_PATTERN='[$a-zA-Z_.][-.a-zA-Z0-9_(){}/$+]*';
+my $TARGET_PATTERN='[$a-zA-Z_.@][-.a-zA-Z0-9_(){}/$+@]*';
 # A rule has three parts: a list of targets, a list of dependencies,
 # and optionally actions.
 my $RULE_PATTERN =

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6c3cc28..ddf5d63 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in
 
-XFAIL_TESTS = subdir5.test substtarg.test
+XFAIL_TESTS = subdir5.test
 
 TESTS =        \
 acinclude.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 458c614..7c5a59e 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -66,7 +66,7 @@ _am_include = @_am_include@
 _am_quote = @_am_quote@
 install_sh = @install_sh@
 
-XFAIL_TESTS = subdir5.test substtarg.test
+XFAIL_TESTS = subdir5.test
 
 TESTS = \
 acinclude.test \