Fri Nov 12 08:49:38 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * modules/TemplateParser.pm:
          Committed fix from Adam Mitz that fixed problems with dds4ccm and
          cdt6/cdt7

2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index eb04f367..c2743de5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Nov 12 08:49:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * modules/TemplateParser.pm:
+          Committed fix from Adam Mitz that fixed problems with dds4ccm and
+          cdt6/cdt7
+
 Wed Nov 10 02:28:28 UTC 2010  James H. Hill  <hillj at cs dot iupui dot edu>
 
         * config/splice_ts_defaults.mpb:
diff --git a/modules/TemplateParser.pm b/modules/TemplateParser.pm
index 85dc6705..4bfa7cbb 100644
--- a/modules/TemplateParser.pm
+++ b/modules/TemplateParser.pm
@@ -1891,9 +1891,9 @@ sub perform_translate_vars {
   my ($pre, $post) = ($os eq 'win32') ? ('%', '%') : ('${', '}');
 
   ## Replace $() with the environment variable reference characters.
-  $val =~ s[\$\(([^)]+)\)(\S*)][my ($var, $rest) = ($1, $2);
-                                $rest =~ s!/!\\!g if $os eq 'win32';
-                                "$pre$var$post$rest"]ge;
+  $val =~ s{\$\(([^)]+)\)([^\s\$]*)}{my ($var, $rest) = ($1, $2);
+                                     $rest =~ s!/!\\!g if $os eq 'win32';
+                                     "$pre$var$post$rest"}ge;
   return $val;
 }