summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-09-16 20:10:52 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-09-16 20:10:52 +0000
commit0b01850bdc36f6d24a4fdc43ae2051e1fb3f86be (patch)
tree37cf046193cbc58c00d52538c0e5b2f2fb5d8983
parent84cc67f98b7f26331de373d4b5b639babd9cac11 (diff)
* runruby.rb: fix incomplete backport r12339.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@13461 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rwxr-xr-xrunruby.rb3
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ec0245c..7570285 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Sep 17 05:01:55 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * runruby.rb: fix incomplete backport r12339.
+
Mon Sep 17 04:56:28 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/thread/test_thread.rb (test_local_barrier),
diff --git a/runruby.rb b/runruby.rb
index cbc5e57..f442d90 100755
--- a/runruby.rb
+++ b/runruby.rb
@@ -32,11 +32,12 @@ unless File.exist?(ruby)
abort "#{ruby} is not found.\nTry `make' first, then `make test', please.\n"
end
-libs = [abs_archdir, File.expand_path("lib", srcdir)]
+libs = [abs_archdir]
if extout
abs_extout = File.expand_path(extout)
libs << File.expand_path("common", abs_extout) << File.expand_path(RUBY_PLATFORM, abs_extout)
end
+libs << File.expand_path("lib", srcdir)
config["bindir"] = abs_archdir
ENV["RUBY"] = File.expand_path(ruby)
ENV["PATH"] = [abs_archdir, ENV["PATH"]].compact.join(File::PATH_SEPARATOR)
diff --git a/version.h b/version.h
index ba76ada..de11525 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2007-09-17"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20070917
-#define RUBY_PATCHLEVEL 104
+#define RUBY_PATCHLEVEL 105
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8