summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-02 12:23:34 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-02 12:23:34 +0000
commitde7048ce904132c1e80d3a66ea1ae02cb93c5216 (patch)
tree51a94eeb5ebeb32d2fbda4d29c2eebae49fbea0d
parent26c72fecb930b0792493ec7e66b8a66b50b9b14c (diff)
* Makefile.in (fake.rb): need to expand the topdir in case of it
being relative, a patch from Luis Lavena <luislavena at gmail.com>. [ruby-core:33466] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@30051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.in4
-rw-r--r--version.h10
3 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index d8925b3650..e830a2d2a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Dec 2 21:13:42 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * Makefile.in (fake.rb): need to expand the topdir in case of it
+ being relative, a patch from Luis Lavena <luislavena at gmail.com>.
+ [ruby-core:33466]
+
Wed Nov 24 18:24:26 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/socket/extconf.rb: backrorted entirely from ruby_1_8, with small
diff --git a/Makefile.in b/Makefile.in
index 4faabc3469..6271138fbb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -138,7 +138,9 @@ fake.rb: Makefile
end; \
end; \
prehook = proc do |e|; \
- Config::MAKEFILE_CONFIG["top_srcdir"] = $$top_srcdir = "@top_srcdir@" unless e; \
+ builddir = File.expand_path(File.dirname(__FILE__)); \
+ Config::MAKEFILE_CONFIG["top_srcdir"] = $$top_srcdir = \
+ File.expand_path("@top_srcdir@", builddir) unless e; \
untrace_var(:$$extmk, prehook); \
end; \
trace_var(:$$extmk, prehook); \
diff --git a/version.h b/version.h
index 79b8291b83..21e1232ec4 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2010-11-24"
+#define RUBY_RELEASE_DATE "2010-12-02"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20101124
-#define RUBY_PATCHLEVEL 326
+#define RUBY_RELEASE_CODE 20101202
+#define RUBY_PATCHLEVEL 327
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2010
-#define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 24
+#define RUBY_RELEASE_MONTH 12
+#define RUBY_RELEASE_DAY 2
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];