From 8a10bf6fc0fc965d8fadf24ae3942cb2ab90139c Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 2 Jun 2006 13:23:02 +0000
Subject: [PATCH] * lib/forwardable.rb: RDoc typo fix from Jan Svitok  
 <jan.svitok at gmail.com>.  [ruby-core:07943]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          | 5 +++++
 lib/forwardable.rb | 4 ++--
 mkconfig.rb        | 6 ++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1fc2c98f4e..fd5e600ecd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun  2 22:08:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/forwardable.rb: RDoc typo fix from Jan Svitok
+	  <jan.svitok at gmail.com>.  [ruby-core:07943]
+
 Fri Jun  2 19:02:09 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/extconf.rb: use create_header.
diff --git a/lib/forwardable.rb b/lib/forwardable.rb
index 79004ccd20..b6344cd4f6 100644
--- a/lib/forwardable.rb
+++ b/lib/forwardable.rb
@@ -92,7 +92,7 @@
 # array, like this:
 #
 #   class RecordCollection
-#     extends Forwardable
+#     extend Forwardable
 #     def_delegator :@records, :[], :record_number
 #   end
 #
@@ -100,7 +100,7 @@
 # all of which delegate to @records, this is how you can do it:
 #
 #   class RecordCollection
-#     # extends Forwardable, but we did that above
+#     # extend Forwardable, but we did that above
 #     def_delegators :@records, :size, :<<, :map
 #   end
 #
diff --git a/mkconfig.rb b/mkconfig.rb
index 1208606aa1..74db915cee 100644
--- a/mkconfig.rb
+++ b/mkconfig.rb
@@ -38,9 +38,11 @@ vars = {}
 has_version = false
 File.foreach "config.status" do |line|
   next if /^#/ =~ line
-  if /^s[%,]@program_transform_name@[%,]s,(.*)/ =~ line
+  line.gsub!(/\|#_!!_#\|/, '')
+  if /^s[%,]@program_transform_name@[%,]s(\\?.)(.*)\1[%,]/ =~ line
     next if $install_name
-    ptn = $1.sub(/\$\$/, '$').split(/,/)	#'
+    sep = Regexp.quote($1)
+    ptn = $2.sub(/\$\$/, '$').split(/#{sep}/,2)
     v_fast << "  CONFIG[\"ruby_install_name\"] = \"" + "ruby".sub(/#{ptn[0]}/,ptn[1]) + "\"\n"
   elsif /^s[%,]@(\w+)@[%,](.*)[%,]/ =~ line
     name = $1