eban

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@980 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index c11810b0e..30807d519 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Sep 27 16:13:05 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* mkconfig.rb: variables should be expanded only if /\$\{?\w+\}?/.
+
 Tue Sep 26 18:09:51 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* string.c: include <math.h>
diff --git a/mkconfig.rb b/mkconfig.rb
index c2fbaf013..175a4c3b1 100644
--- a/mkconfig.rb
+++ b/mkconfig.rb
@@ -39,7 +39,7 @@ File.foreach "config.status" do |$_|
     next if $install_name and name =~ /^RUBY_INSTALL_NAME$/
     next if $so_name and name =~ /^RUBY_SO_NAME$/
     v = "  CONFIG[\"" + name + "\"] = " +
-      val.sub(/^\s*(.*)\s*$/, '"\1"').gsub(/\$\{?([^(){}]+)\}?/) {
+      val.sub(/^\s*(.*)\s*$/, '"\1"').gsub(/\$\{?(\w+)\}?/) {
       "\#{CONFIG[\\\"#{$1}\\\"]}"
     } + "\n"
     if fast[name]
diff --git a/version.h b/version.h
index b2a018726..bb3d71521 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 #define RUBY_VERSION "1.6.1"
-#define RUBY_RELEASE_DATE "2000-09-26"
+#define RUBY_RELEASE_DATE "2000-09-27"
 #define RUBY_VERSION_CODE 161
-#define RUBY_RELEASE_CODE 20000926
+#define RUBY_RELEASE_CODE 20000927