summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-08-09 14:46:44 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-08-09 14:46:44 +0000
commit1fcc1762ad0fa839bd4609371714d60e2aecbcbf (patch)
tree89e45df6b21581d1adda97ffeebe99766cf728ed
parent2b648fb7c490d9ebe46ff4b015bdd3632c3d7ca6 (diff)
fake.rb.in: remove duplications
* template/fake.rb.in (builddir): remove duplications git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36671 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rwxr-xr-xtemplate/fake.rb.in6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c8a2fe06cf..1ab22a814d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 9 23:46:42 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * template/fake.rb.in (builddir): remove duplications
+
+
Thu Aug 9 20:03:11 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
* test/ruby/test_file_exhaustive.rb
diff --git a/template/fake.rb.in b/template/fake.rb.in
index 7bfa0aef01..c94eec3516 100755
--- a/template/fake.rb.in
+++ b/template/fake.rb.in
@@ -22,10 +22,11 @@ if RUBY_PLATFORM =~ /mswin|bccwin|mingw/
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 @@ prehook = proc do |extmk|
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