ruby-changes:60425
From: Nobuyoshi <ko1@a...>
Date: Mon, 16 Mar 2020 17:49:10 +0900 (JST)
Subject: [ruby-changes:60425] 8a6ba10f9d (master): Do not make disabled directories at installation [Bug #12392]
https://git.ruby-lang.org/ruby.git/commit/?id=8a6ba10f9d From 8a6ba10f9dd456cf54de800203cf04bbe42271fb Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Mon, 16 Mar 2020 17:26:10 +0900 Subject: Do not make disabled directories at installation [Bug #12392] diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index ce7a8ea..b8526c1 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -335,10 +335,14 @@ rubyhdrdir = CONFIG["rubyhdrdir", true] https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L335 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' -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/