summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-22 07:22:23 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-22 07:22:23 +0000
commit2a9739f1a444ca3fdcc90d21a1504a0203d39d73 (patch)
treefd1ac8b82d1655ef92ebb044e53fba780506166a
parent134e2d619a3c4d52021a7ceda17c173e63e6e588 (diff)
Fri, 19 Nov 2010 19:33:27 +0900 URABE, Shyouhei <shyouhei@ruby-lang.org>
OK, this is 1.8.7 specific (rare!) * Makefile.in (fake.rb): hook needed to fake mkmf.rb. #2531 [ruby-core:27327] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29866 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in5
-rw-r--r--version.h2
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 35b63ea72b..63e4f4e80b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 19 19:28:00 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * Makefile.in (fake.rb): hook needed to fake mkmf.rb.
+ #2531 [ruby-core:27327]
+
Mon Oct 18 10:21:01 2010 NARUSE, Yui <naruse@ruby-lang.org>
* lib/net/http.rb (transport_request): @socket may be nil.
diff --git a/Makefile.in b/Makefile.in
index 656ae903f1..4faabc3469 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -137,6 +137,11 @@ fake.rb: Makefile
ALT_SEPARATOR = "\\\\"; \
end; \
end; \
+ prehook = proc do |e|; \
+ Config::MAKEFILE_CONFIG["top_srcdir"] = $$top_srcdir = "@top_srcdir@" unless e; \
+ untrace_var(:$$extmk, prehook); \
+ end; \
+ trace_var(:$$extmk, prehook); \
' > $@
Makefile: $(srcdir)/Makefile.in
diff --git a/version.h b/version.h
index e39e99c472..c50ac51721 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2010-11-22"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20101122
-#define RUBY_PATCHLEVEL 315
+#define RUBY_PATCHLEVEL 316
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8