mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	[rubygems/rubygems] Remove MacOS specific gem layout
MacOS should properly configure Ruby. They should not expect us to
maintain a different layout just for them.
ecad900925
			
			
This commit is contained in:
		
							parent
							
								
									717ad64f41
								
							
						
					
					
						commit
						afabef5a5a
					
				
				
				Notes:
				
					git
				
				2021-08-31 19:07:08 +09:00 
				
			
			
			
		
		
					 1 changed files with 2 additions and 20 deletions
				
			
		|  | @ -34,21 +34,7 @@ module Gem | |||
|   # specified in the environment | ||||
| 
 | ||||
|   def self.default_dir | ||||
|     path = if defined? RUBY_FRAMEWORK_VERSION | ||||
|              [ | ||||
|                File.dirname(RbConfig::CONFIG['sitedir']), | ||||
|                'Gems', | ||||
|                RbConfig::CONFIG['ruby_version'], | ||||
|              ] | ||||
|            else | ||||
|              [ | ||||
|                RbConfig::CONFIG['rubylibprefix'], | ||||
|                'gems', | ||||
|                RbConfig::CONFIG['ruby_version'], | ||||
|              ] | ||||
|            end | ||||
| 
 | ||||
|     @default_dir ||= File.join(*path) | ||||
|     @default_dir ||= File.join(RbConfig::CONFIG['rubylibprefix'], 'gems', RbConfig::CONFIG['ruby_version']) | ||||
|   end | ||||
| 
 | ||||
|   ## | ||||
|  | @ -197,12 +183,8 @@ module Gem | |||
|   # The default directory for binaries | ||||
| 
 | ||||
|   def self.default_bindir | ||||
|     if defined? RUBY_FRAMEWORK_VERSION # mac framework support | ||||
|       '/usr/local/bin' | ||||
|     else # generic install | ||||
|     RbConfig::CONFIG['bindir'] | ||||
|   end | ||||
|   end | ||||
| 
 | ||||
|   def self.ruby_engine | ||||
|     RUBY_ENGINE | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 David Rodríguez
						David Rodríguez