kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

mkmf.rb: fix for bundled gems

Browse source 
* lib/mkmf.rb (install_dirs): enable extout in RUBYARCHDIR only
  when extmk.

* lib/mkmf.rb (create_makefile): ditto for TIMESTAMP_DIR.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56180 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-09-18 05:21:05 +00:00
parent a333b8e64e
commit f9b36a3958
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/mkmf.rb
View file

@ -176,7 +176,7 @@ module MakeMakefile
] ]
def install_dirs(target_prefix = nil) def install_dirs(target_prefix = nil)
if $extout if $extout and $extmk
dirs = [ dirs = [
['BINDIR', '$(extout)/bin'], ['BINDIR', '$(extout)/bin'],
['RUBYCOMMONDIR', '$(extout)/common'], ['RUBYCOMMONDIR', '$(extout)/common'],
@ -2288,7 +2288,7 @@ DLLIB = #{dllib}
EXTSTATIC = #{$static || ""} EXTSTATIC = #{$static || ""}
STATIC_LIB = #{staticlib unless $static.nil?} STATIC_LIB = #{staticlib unless $static.nil?}
#{!$extout && defined?($installed_list) ? "INSTALLED_LIST = #{$installed_list}\n" : ""} #{!$extout && defined?($installed_list) ? "INSTALLED_LIST = #{$installed_list}\n" : ""}
TIMESTAMP_DIR = #{$extout ? '$(extout)/.timestamp' : '.'} TIMESTAMP_DIR = #{$extout && $extmk ? '$(extout)/.timestamp' : '.'}
" #" " #"
# TODO: fixme # TODO: fixme
install_dirs.each {|d| conf << ("%-14s= %s\n" % d) if /^[[:upper:]]/ =~ d[0]} install_dirs.each {|d| conf << ("%-14s= %s\n" % d) if /^[[:upper:]]/ =~ d[0]}