ruby-changes:24620
From: nobu <ko1@a...>
Date: Thu, 9 Aug 2012 23:46:54 +0900 (JST)
Subject: [ruby-changes:24620] nobu:r36671 (trunk): fake.rb.in: remove duplications
nobu 2012-08-09 23:46:44 +0900 (Thu, 09 Aug 2012) New Revision: 36671 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36671 Log: fake.rb.in: remove duplications * template/fake.rb.in (builddir): remove duplications Modified files: trunk/ChangeLog trunk/template/fake.rb.in Index: ChangeLog =================================================================== --- ChangeLog (revision 36670) +++ ChangeLog (revision 36671) @@ -1,3 +1,8 @@ +Thu Aug 9 23:46:42 2012 Nobuyoshi Nakada <nobu@r...> + + * template/fake.rb.in (builddir): remove duplications + + Thu Aug 9 20:03:11 2012 Hiroshi Shirosaki <h.shirosaki@g...> * test/ruby/test_file_exhaustive.rb Index: template/fake.rb.in =================================================================== --- template/fake.rb.in (revision 36670) +++ template/fake.rb.in (revision 36671) @@ -22,10 +22,11 @@ end end -$:.unshift(File.expand_path("..", __FILE__)) +builddir = File.expand_path(File.dirname(__FILE__)) +$:.unshift(builddir) posthook = proc do mkconfig = RbConfig::MAKEFILE_CONFIG - extout = File.expand_path(mkconfig["EXTOUT"], mkconfig["builddir"]) + extout = File.expand_path(mkconfig["EXTOUT"], builddir) $arch_hdrdir = "#{extout}/include/$(arch)" $ruby = baseruby untrace_var(:$ruby, posthook) @@ -34,7 +35,6 @@ unless extmk config = RbConfig::CONFIG mkconfig = RbConfig::MAKEFILE_CONFIG - builddir = File.expand_path(File.dirname(__FILE__)) mkconfig["top_srcdir"] = $top_srcdir = File.expand_path("@top_srcdir@", builddir) mkconfig["rubyhdrdir"] = "$(top_srcdir)/include" mkconfig["builddir"] = config["builddir"] = builddir -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/