diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-16 20:18:29 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-16 20:18:29 +0000 |
commit | e80f2c118a557f8e387b8b7ab0a1de7a5b3dc1e2 (patch) | |
tree | 96545f820c4322a223548f03951c34ed638ca9c6 /lib | |
parent | 45c858d918e56015dd08512982752e85f6f4006d (diff) | |
download | ruby-e80f2c118a557f8e387b8b7ab0a1de7a5b3dc1e2.tar.gz |
* lib/rubygems: Update to RubyGems master 1c5f4b3. Allows rubygems
repackagers to disable backward-compatible shared gem directory
behavior.
* test/rubygems: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44253 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/rubygems/defaults.rb | 8 | ||||
-rw-r--r-- | lib/rubygems/ext/ext_conf_builder.rb | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb index e4bf4e5a7f..715c0b71b3 100644 --- a/lib/rubygems/defaults.rb +++ b/lib/rubygems/defaults.rb @@ -152,4 +152,12 @@ module Gem def self.default_gems_use_full_paths? ruby_engine != 'ruby' end + + ## + # Install extensions into lib as well as into the extension directory. + + def self.install_extension_in_lib # :nodoc: + true + end + end diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb index 84d4609017..402aa966c0 100644 --- a/lib/rubygems/ext/ext_conf_builder.rb +++ b/lib/rubygems/ext/ext_conf_builder.rb @@ -44,7 +44,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder if tmp_dest # TODO remove in RubyGems 3 - if lib_dir then + if Gem.install_extension_in_lib and lib_dir then FileUtils.mkdir_p lib_dir entries = Dir.entries(tmp_dest) - %w[. ..] entries = entries.map { |entry| File.join tmp_dest, entry } |