diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2020-03-18 11:24:21 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2020-03-18 11:24:21 +0000 |
commit | d9697bbe99665b4c9553efb7e69407a8b108aab5 (patch) | |
tree | f4d15fedf965f37f12886a3a61604ce808442449 | |
parent | 617e7ee05c400cb6370b5fa8181552d0f512c777 (diff) |
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
-rwxr-xr-x | tool/rbinstall.rb | 12 | ||||
-rw-r--r-- | version.h | 6 |
2 files changed, 11 insertions, 7 deletions
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index b99d9ca364..0b02025d96 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -330,10 +330,14 @@ rubyhdrdir = CONFIG["rubyhdrdir", true] 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' @@ -1,10 +1,10 @@ #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" |