akr	2007-11-15 17:08:40 +0900 (Thu, 15 Nov 2007)

  New Revision: 13931

  Modified files:
    trunk/ChangeLog
    trunk/tool/compile_prelude.rb

  Log:
    * tool/compile_prelude.rb: fix first substitution.
      use constant for prefix.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/tool/compile_prelude.rb?r1=13931&r2=13930
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13931&r2=13930

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13930)
+++ ChangeLog	(revision 13931)
@@ -1,3 +1,8 @@
+Thu Nov 15 17:07:54 2007  Tanaka Akira  <akr@f...>
+
+	* tool/compile_prelude.rb: fix first substitution.
+	  use constant for prefix.
+
 Thu Nov 15 14:29:56 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* common.mk (prereq): added auto generated sources.  [ruby-dev:32280]
Index: tool/compile_prelude.rb
===================================================================
--- tool/compile_prelude.rb	(revision 13930)
+++ tool/compile_prelude.rb	(revision 13931)
@@ -29,6 +29,7 @@
   need_ruby_prefix = false
   File.readlines(filename).each {|line|
     line.gsub!(/RbConfig::CONFIG\["(\w+)"\]/) {
+      key = $1
       unless mkconf
         require 'rbconfig'
         mkconf = RbConfig::MAKEFILE_CONFIG.merge('prefix'=>'#{TMP_RUBY_PREFIX}')
@@ -36,12 +37,12 @@
         setup_ruby_prefix = "TMP_RUBY_PREFIX = $:.grep(%r{\\A/}).last[0..#{-exlen-1}]\n"
         teardown_ruby_prefix = 'Object.class_eval { remove_const "TMP_RUBY_PREFIX" }'
       end
-      if RbConfig::MAKEFILE_CONFIG.has_key? $1
-        val = RbConfig.expand("$(#$1)", mkconf)
+      if RbConfig::MAKEFILE_CONFIG.has_key? key
+        val = RbConfig.expand("$(#{key})", mkconf)
         need_ruby_prefix = true if /\A\#{TMP_RUBY_PREFIX\}/ =~ val
         c_esc(val)
       else
-        $&
+        "nil"
       end
     }
     lines << c_esc(line)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml