2001-05-12 Raja R Harinath <harinath@cs.umn.edu>

	* automake.in (ASSIGNMENT_PATTERN): Make variable-name pattern
	stop at the first '='.
	* tests/Makefile.am (TESTS): Added vars.test.
	* tests/vars.test: New file.

diff --git a/ChangeLog b/ChangeLog
index 1338ae4d19a5e082f11ea2e28298a9e9dc692e41..e92c195f2ec85c803b8be456fb375eb9cb89107e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-12  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * automake.in (ASSIGNMENT_PATTERN): Make variable-name pattern 
+       stop at the first '='.
+       * tests/Makefile.am (TESTS): Added vars.test.
+       * tests/vars.test: New file.
+
 2001-05-12  Akim Demaille  <akim@epita.fr>
 
        * automake.in (&handle_single_transform_list): Simplify

diff --git a/automake.in b/automake.in
index e1707e80d6de652febf278d525cb30ac5d1cfe7d..8f3062df983d5a25771943ec39e3771207e85082 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -125,7 +125,7 @@ my $SUFFIX_RULE_PATTERN = '^\.([a-zA-Z0-9]+)\.([a-zA-Z0-9]+)$';
 # leading tabs here then we need to make the reader smarter, because
 # otherwise it will think rules like `foo=bar; \' are errors.
 my $MACRO_PATTERN = '^[A-Za-z0-9_@]+$';
-my $ASSIGNMENT_PATTERN = '^ *([^ \t]*)\s*([:+]?)=\s*(.*)$';
+my $ASSIGNMENT_PATTERN = '^ *([^ \t=]*)\s*([:+]?)=\s*(.*)$';
 # This pattern recognizes a Gnits version id and sets $1 if the
 # release is an alpha release.  We also allow a suffix which can be
 # used to extend the version number with a "fork" identifier.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0a2a455d7a0fc4e4d52c9710a384d51c5e50ae0f..51ac2d35a8876bae7531a93ce5ef3719803150c2 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -271,6 +271,7 @@ texinfo8.test \
 texinfo9.test \
 texinfo10.test \
 unused.test \
+vars.test \
 vartar.test \
 version.test \
 version2.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index a6f1a94d743abf6973deaf095c481f9045a4ab58..9bda144c50f58a14f440856e6de61669c2651eea 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -279,7 +279,6 @@ pluseq8.test \
 ppf77.test \
 pr2.test \
 pr9.test \
-pr19.test \
 pr72.test \
 pr87.test \
 prefix.test \
@@ -344,6 +343,7 @@ texinfo8.test \
 texinfo9.test \
 texinfo10.test \
 unused.test \
+vars.test \
 vartar.test \
 version.test \
 version2.test \

diff --git a/tests/vars.test b/tests/vars.test
new file mode 100755 (executable)
index 0000000..2f71a49
--- /dev/null
+++ b/tests/vars.test
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+# Test various variable definitions that include an '=' sign
+# From Raja R Harinath
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am << 'END'
+MY_FLAGS_1=-DABC=345
+MY_FLAGS_2= -DABC=345
+MY_FLAGS_3 =-DABC=345
+MY_FLAGS_4 = -DABC=345
+END
+
+$AUTOMAKE