diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-21 14:31:20 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-21 14:31:20 +0000 |
| commit | 556e166e093d88cd3fb0193fb5565e79c141b1a6 (patch) | |
| tree | 24885e8fed8881e0370e63b7120af03589d16391 | |
| parent | 2fe4c4c1e57f741d4bbaf2e15f551dbd23fec519 (diff) | |
| download | ruby-556e166e093d88cd3fb0193fb5565e79c141b1a6.tar.gz ruby-556e166e093d88cd3fb0193fb5565e79c141b1a6.tar.xz ruby-556e166e093d88cd3fb0193fb5565e79c141b1a6.zip | |
* lib/mkmf.rb (configuration): generalized nmake dependent code.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/mkmf.rb | 8 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Wed Sep 21 23:30:44 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (configuration): generalized nmake dependent code. + Wed Sep 21 09:07:55 2005 Yukihiro Matsumoto <matz@ruby-lang.org> * stable version 1.8.3 released. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 3f679c60e..3ddfced1d 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']} LIBRUBY = #{CONFIG['LIBRUBY']} @@ -943,7 +949,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'} |