ruby-changes:60438
From: nagachika <ko1@a...>
Date: Wed, 18 Mar 2020 20:24:38 +0900 (JST)
Subject: [ruby-changes:60438] d9697bbe99 (ruby_2_6): merge revision(s) 8a6ba10f9dd456cf54de800203cf04bbe42271fb: [Backport #12392]
https://git.ruby-lang.org/ruby.git/commit/?id=d9697bbe99 From d9697bbe99665b4c9553efb7e69407a8b108aab5 Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Wed, 18 Mar 2020 11:24:21 +0000 Subject: merge revision(s) 8a6ba10f9dd456cf54de800203cf04bbe42271fb: [Backport #12392] Do not make disabled directories at installation [Bug #12392] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67844 b2dd03c8-39d4-4d8f-98ff-823fe69b080e diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index b99d9ca..0b02025 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -330,10 +330,14 @@ rubyhdrdir = CONFIG["rubyhdrdir", true] https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L330 archhdrdir = CONFIG["rubyarchhdrdir"] || (rubyhdrdir + "/" + CONFIG['arch']) rubylibdir = CONFIG["rubylibdir", true] archlibdir = CONFIG["rubyarchdir", true] -sitelibdir = CONFIG["sitelibdir"] -sitearchlibdir = CONFIG["sitearchdir"] -vendorlibdir = CONFIG["vendorlibdir"] -vendorarchlibdir = CONFIG["vendorarchdir"] +if CONFIG["sitedir"] + sitelibdir = CONFIG["sitelibdir"] + sitearchlibdir = CONFIG["sitearchdir"] +end +if CONFIG["vendordir"] + vendorlibdir = CONFIG["vendorlibdir"] + vendorarchlibdir = CONFIG["vendorarchdir"] +end mandir = CONFIG["mandir", true] docdir = CONFIG["docdir", true] enable_shared = CONFIG["ENABLE_SHARED"] == 'yes' diff --git a/version.h b/version.h index d02090f..78f7211 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L1 #define RUBY_VERSION "2.6.6" -#define RUBY_RELEASE_DATE "2020-03-10" -#define RUBY_PATCHLEVEL 131 +#define RUBY_RELEASE_DATE "2020-03-18" +#define RUBY_PATCHLEVEL 132 #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 10 +#define RUBY_RELEASE_DAY 18 #include "ruby/version.h" -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/