diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-18 05:21:05 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-18 05:21:05 +0000 |
| commit | 9f28a9d3f06c323a48ba35fa149e3c56bdd7fa15 (patch) | |
| tree | fc471c72712c1939c0acc0ab1276da706fcc2c88 | |
| parent | 208e5593f741e9321efb53e227c4a9fdee140d90 (diff) | |
| download | ruby-9f28a9d3f06c323a48ba35fa149e3c56bdd7fa15.tar.gz | |
mkmf.rb: fix for bundled gems
* 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
| -rw-r--r-- | lib/mkmf.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 53f9fd96fa..787a59d4ee 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -176,7 +176,7 @@ module MakeMakefile ] def install_dirs(target_prefix = nil) - if $extout + if $extout and $extmk dirs = [ ['BINDIR', '$(extout)/bin'], ['RUBYCOMMONDIR', '$(extout)/common'], @@ -2288,7 +2288,7 @@ DLLIB = #{dllib} EXTSTATIC = #{$static || ""} STATIC_LIB = #{staticlib unless $static.nil?} #{!$extout && defined?($installed_list) ? "INSTALLED_LIST = #{$installed_list}\n" : ""} -TIMESTAMP_DIR = #{$extout ? '$(extout)/.timestamp' : '.'} +TIMESTAMP_DIR = #{$extout && $extmk ? '$(extout)/.timestamp' : '.'} " #" # TODO: fixme install_dirs.each {|d| conf << ("%-14s= %s\n" % d) if /^[[:upper:]]/ =~ d[0]} |