nobu	2012-08-29 14:59:07 +0900 (Wed, 29 Aug 2012)

  New Revision: 36846

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

  Log:
    mkrunnable.rb: config directory names
    
    * tool/mkrunnable.rb: collect directory names from config.

  Modified files:
    trunk/tool/mkrunnable.rb

Index: tool/mkrunnable.rb
===================================================================
--- tool/mkrunnable.rb	(revision 36845)
+++ tool/mkrunnable.rb	(revision 36846)
@@ -42,7 +42,9 @@
 extout = ARGV[0] || config["EXTOUT"]
 version = config["ruby_version"]
 arch = config["arch"]
-["bin", "lib"].each do |dir|
+bindir = File.basename(config["bindir"])
+libdir = File.basename(config["libdir"])
+[bindir, libdir].each do |dir|
   File.directory?(dir) or mkdir_p(dir)
 end
 
@@ -53,16 +55,16 @@
 [ruby_install_name, rubyw_install_name, goruby_install_name].map do |ruby|
   ruby += exeext
   if ruby and !ruby.empty?
-    ln_safe("../#{ruby}", "bin/#{ruby}")
+    ln_safe("../#{ruby}", "#{bindir}/#{ruby}")
   end
 end
 libruby = config.values_at("LIBRUBY_A", "LIBRUBY_SO")
 libruby.concat(config["LIBRUBY_ALIASES"].split)
-libruby.each {|lib|ln_safe("../#{lib}", "lib/#{lib}")}
+libruby.each {|lib|ln_safe("../#{lib}", "#{libdir}/#{lib}")}
 if File.expand_path(extout) == extout
-  ln_dir_safe(extout, "lib/ruby")
+  ln_dir_safe(extout, "#{libdir}/ruby")
 else
-  ln_dir_safe(File.join("..", extout), "lib/ruby")
+  ln_dir_safe(File.join("..", extout), "#{libdir}/ruby")
   cur = "#{extout}/".gsub(/(\A|\/)(?:\.\/)+/, '\1').tr_s('/', '/')
   nil while cur.sub!(/[^\/]+\/\.\.\//, '')
   if /(\A|\/)\.\.\// =~ cur

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