diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-03-16 17:26:10 +0900 |
---|---|---|
committer | NARUSE, Yui <naruse@airemix.jp> | 2020-03-26 21:18:25 +0900 |
commit | 95c3bb6c426a11253644a86137bb67c542fd5799 (patch) | |
tree | e56ffb02e9b4b1a377476838ad2dee41edb8d7e7 | |
parent | 1853efc46dba862c50df7710cfbacded999ae2ec (diff) | |
download | ruby-95c3bb6c426a11253644a86137bb67c542fd5799.tar.gz |
Do not make disabled directories at installation [Bug #12392]
(cherry picked from commit 8a6ba10f9dd456cf54de800203cf04bbe42271fb)
-rwxr-xr-x | tool/rbinstall.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index e5c34b5908..060390626f 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -335,10 +335,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' |