naruse	2013-02-17 01:10:55 +0900 (Sun, 17 Feb 2013)

  New Revision: 39284

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39284

  Log:
    * tool/mkconfig.rb: remove prefix from rubyarchdir.
      r39267 expands variables, it changes expansion timing,
      breaks RbConfig::CONFIG["includedir"] and building
      extension libraries with installed ruby.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 39283)
+++ ChangeLog	(revision 39284)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Feb 17 00:52:14 2013  NARUSE, Yui  <naruse@r...>
+
+	* tool/mkconfig.rb: remove prefix from rubyarchdir.
+	  r39267 expands variables, it changes expansion timing,
+	  breaks RbConfig::CONFIG["includedir"] and building
+	  extension libraries with installed ruby.
+
 Sat Feb 16 20:51:17 2013  Kazuki Tsujimoto  <kazuki@c...>
 
 	* vm.c (ENV_IN_HEAP_P): fix off-by-one error.
Index: tool/mkconfig.rb
===================================================================
--- tool/mkconfig.rb	(revision 39283)
+++ tool/mkconfig.rb	(revision 39284)
@@ -167,7 +167,7 @@ def vars.expand(val, config = self) https://github.com/ruby/ruby/blob/trunk/tool/mkconfig.rb#L167
   val
 end
 vars["prefix"] = ""
-prefix = vars.expand(vars["rubyarchdir"])
+prefix = vars.expand(vars["rubyarchdir"]).sub!(vars.expand(vars["exec_prefix"]), '')
 print "  TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n"
 print "  DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n"
 print <<'ARCH' if universal

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