From f7ca4bc1efdd078a1452fc2b79a6ad4ada37b57e Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Sat, 10 May 1997 22:27:47 +0000
Subject: [PATCH] var subst patch from ian

---
 ChangeLog   | 5 +++++
 TODO        | 5 +++++
 automake.in | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ba258ab3f..8921ba939 100644
--- 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 951ec33ad..acc788159 100644
--- 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 fa6ee92e2..c82eda96e 100755
--- 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);
-- 
2.47.3