From b501eda42f5ca7aa277e337d3cea933a0220d2af Mon Sep 17 00:00:00 2001 From: nagachika Date: Mon, 4 Mar 2013 14:37:48 +0000 Subject: merge revision(s) 39284: [Backport #7860] * tool/mkconfig.rb: remove prefix from rubyarchdir. r39267 expands variables, it changes expansion timing, breaks RbConfig::CONFIG["includedir"] and building extension libraries with installed ruby. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39581 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ tool/mkconfig.rb | 2 +- version.h | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50c32df1e4..d58b9be97a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Mar 4 23:37:14 2013 NARUSE, Yui + + * tool/mkconfig.rb: remove prefix from rubyarchdir. + r39267 expands variables, it changes expansion timing, + breaks RbConfig::CONFIG["includedir"] and building + extension libraries with installed ruby. + Sun Mar 3 02:45:13 2013 Kazuki Tsujimoto * vm.c (ENV_IN_HEAP_P): fix off-by-one error. diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index e4a925cd51..92c765499f 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -167,7 +167,7 @@ def vars.expand(val, config = self) val end vars["prefix"] = "" -prefix = vars.expand(vars["rubyarchdir"]) +prefix = vars.expand(vars["rubyarchdir"]).sub!(vars.expand(vars["exec_prefix"]), '') print " TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n" print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n" print <<'ARCH' if universal diff --git a/version.h b/version.h index 65c334d460..d28cf2ea47 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2013-03-03" -#define RUBY_PATCHLEVEL 10 +#define RUBY_RELEASE_DATE "2013-03-04" +#define RUBY_PATCHLEVEL 11 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 3 +#define RUBY_RELEASE_DAY 4 #include "ruby/version.h" -- cgit v1.2.3