var subst patch from ian

diff --git a/ChangeLog b/ChangeLog
index ba258ab3f812e65f96e28e133fe85b5f8f99e2fe..8921ba939ac0fdcecb466f9b90b042a60344a4da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May  1 12:53:46 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+       * automake.in (value_to_list): Don't fail when a variable
+       substitution is not a complete word.
+
 Tue May  6 15:22:41 1997  Ian Lance Taylor  <ian@cygnus.com>
 
        * subdirs.am: Fix check for make -k to use $(MAKEFLAGS) and to not

diff --git a/TODO b/TODO
index 951ec33ad8397325acabc45fc524f1a402aefa8d..acc788159da33b87e6d751eadadb7b1e6acce05c 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,5 +1,10 @@
 * in --cygnus, clean-info not generated at top level
 
+* what if an element of a scanned variable looks like
+       $(FOO).$(BAR)  ?
+  or some other arbitrary thing?
+  right now we try to cope, but not very well
+
 * update text in missing
   avoid passive voice
 

diff --git a/automake.in b/automake.in
index fa6ee92e20a47b7a604e2a8fb5c17c95d07dc361..c82eda96e755237726b2cb0737e1358a481a8b4e 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -4673,7 +4673,7 @@ sub value_to_list
        last if /^#/;
 
        # Handle variable substitutions.
-       if (/^\$\{(.*)\}$/ || /^\$\((.*)\)$/)
+       if (/^\$\{([^}]*)\}$/ || /^\$\(([^)]*)\)$/)
        {
            local ($varname) = $1;
            local ($from, $to);