summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-09-18 05:21:05 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-09-18 05:21:05 +0000
commitf9b36a395861866131232bc4f725581072b48b63 (patch)
treefc471c72712c1939c0acc0ab1276da706fcc2c88
parenta333b8e64e5b784d5fb7ba2c8dda669bb3f59d8b (diff)
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.rb4
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]}