summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-01-22 07:37:14 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-01-22 07:37:14 +0000
commit9d0bba43bb79cf7d37fa93af66f2a70600f73fec (patch)
tree43c72baac1de723b74f182f5b6b34b899501e84b
parent6aa451b9dd7f7890078dae1f69169b02155f7dc4 (diff)
* mkconfig.rb: autoconf 2.49 support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--mkconfig.rb4
-rw-r--r--version.h4
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7602516..b1bee4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jan 22 16:33:16 2001 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * mkconfig.rb: autoconf 2.49 support.
+
Sat Jan 20 03:54:00 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (yylex): fixed serious syntax misbehavior. do's
diff --git a/mkconfig.rb b/mkconfig.rb
index 63a7351..7deb6ce 100644
--- a/mkconfig.rb
+++ b/mkconfig.rb
@@ -28,11 +28,11 @@ has_srcdir = false
has_version = false
File.foreach "config.status" do |line|
next if /^#/ =~ line
- if /^s%@program_transform_name@%s,(.*)%g$/ =~ line
+ if /^s[%,]@program_transform_name@[%,]s,(.*)[%,]/ =~ line
next if $install_name
ptn = $1.sub(/\$\$/, '$').split(/,/) #'
v_fast << " CONFIG[\"ruby_install_name\"] = \"" + "ruby".sub(ptn[0],ptn[1]) + "\"\n"
- elsif /^s%@(\w+)@%(.*)%g/ =~ line
+ elsif /^s[%,]@(\w+)@[%,](.*)[%,]/ =~ line
name = $1
val = $2 || ""
next if /^(INSTALL|DEFS|configure_input|srcdir|top_srcdir)$/ =~ name
diff --git a/version.h b/version.h
index 79a0434..df4dcae 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
#define RUBY_VERSION "1.7.0"
-#define RUBY_RELEASE_DATE "2001-01-18"
+#define RUBY_RELEASE_DATE "2001-01-22"
#define RUBY_VERSION_CODE 170
-#define RUBY_RELEASE_CODE 20010118
+#define RUBY_RELEASE_CODE 20010122