From d2fcb6790c1139554d1e234b70ec1aac804efbcc Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 21 Sep 2005 14:31:20 +0000 Subject: * lib/mkmf.rb (configuration): generalized nmake dependent code. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/mkmf.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 2784b2a07..29675b2d5 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'} -- cgit