aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-21 14:31:20 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-21 14:31:20 +0000
commitc6b5ca0e217d7767a2db48fa4a40ba59acb0a8f8 (patch)
tree8bd0f06bd52cb0e0b06ce538b7e203ea17acea82 /lib
parent5cbb885ce177e2e3462a87499a72bc7645051069 (diff)
downloadruby-c6b5ca0e217d7767a2db48fa4a40ba59acb0a8f8.tar.gz
* lib/mkmf.rb (configuration): generalized nmake dependent code.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/mkmf.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 2784b2a074..29675b2d5a 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -922,6 +922,12 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
next unless /^(?:src|top|hdr|(.*))dir$/ =~ key and $1
mk << "#{key} = #{with_destdir(var.sub(drive, ''))}\n"
end
+ if !$extmk and !$configure_args.has_key?('--ruby') and
+ sep = config_string('BUILD_FILE_SEPARATOR')
+ sep = ":/=#{sep}"
+ else
+ sep = ""
+ end
mk << %{
CC = #{CONFIG['CC']}
CXX = #{CONFIG['CXX']}
@@ -945,7 +951,7 @@ arch = #{CONFIG['arch']}
sitearch = #{CONFIG['sitearch']}
ruby_version = #{Config::CONFIG['ruby_version']}
ruby = #{$ruby}
-RUBY = #{($nmake && !$extmk && !$configure_args.has_key?('--ruby')) ? '$(ruby:/=\)' : '$(ruby)'}
+RUBY = $(ruby#{sep})
RM = #{config_string('RM') || '$(RUBY) -run -e rm -- -f'}
MAKEDIRS = #{config_string('MAKEDIRS') || '@$(RUBY) -run -e mkdir -- -p'}
INSTALL = #{config_string('INSTALL') || '@$(RUBY) -run -e install -- -vp'}