nobu	2013-12-27 14:46:06 +0900 (Fri, 27 Dec 2013)

  New Revision: 44447

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

  Log:
    mkconfig.rb: prefer unexpanded values
    
    * tool/mkconfig.rb: prefer configured values than overriding
      values for RUBY_INSTALL_NAME and RUBY_SO_NAME when expanded
      results are same.

  Modified files:
    trunk/tool/mkconfig.rb
Index: tool/mkconfig.rb
===================================================================
--- tool/mkconfig.rb	(revision 44446)
+++ tool/mkconfig.rb	(revision 44447)
@@ -42,6 +42,8 @@ v_others = [] https://github.com/ruby/ruby/blob/trunk/tool/mkconfig.rb#L42
 vars = {}
 continued_name = nil
 continued_line = nil
+install_name = nil
+so_name = nil
 File.foreach "config.status" do |line|
   next if /^#/ =~ line
   name = nil
@@ -75,8 +77,8 @@ File.foreach "config.status" do |line| https://github.com/ruby/ruby/blob/trunk/tool/mkconfig.rb#L77
     when /^(?:X|(?:MINI|RUN|BASE)RUBY$)/; next
     when /^(?:MAJOR|MINOR|TEENY)$/; next
     when /^LIBRUBY_D?LD/; next
-    when /^RUBY_INSTALL_NAME$/; next if $install_name
-    when /^RUBY_SO_NAME$/; next if $so_name
+    when /^RUBY_INSTALL_NAME$/; next vars[name] = (install_name = val).dup if $install_name
+    when /^RUBY_SO_NAME$/; next vars[name] = (so_name = val).dup if $so_name
     when /^arch$/; if val.empty? then val = arch else arch = val end
     when /^sitearch$/; val = '$(arch)' if val.empty?
     end
@@ -215,10 +217,16 @@ end https://github.com/ruby/ruby/blob/trunk/tool/mkconfig.rb#L217
 v_others.compact!
 
 if $install_name
+  if install_name and vars.expand("$(RUBY_INSTALL_NAME)") == $install_name
+    $install_name = install_name
+  end
   v_fast << "  CONFIG[\"ruby_install_name\"] = \"" + $install_name + "\"\n"
   v_fast << "  CONFIG[\"RUBY_INSTALL_NAME\"] = \"" + $install_name + "\"\n"
 end
 if $so_name
+  if so_name and vars.expand("$(RUBY_SO_NAME)") == $so_name
+    $so_name = so_name
+  end
   v_fast << "  CONFIG[\"RUBY_SO_NAME\"] = \"" + $so_name + "\"\n"
 end
 

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