From 5af30c19a44422c9a905db4061fe07dc32583bdb Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 19 Mar 2004 02:35:27 +0000
Subject: [PATCH] * lib/mkmf.rb ($beos, $solaris): add OS flags.

* lib/mkmf.rb (RUBY): / is not recognized as path separator on
   nmake/bmake. [ruby-list:39388]

* lib/mkmf.rb (CLEANLIBS, CLEANOBJS): should remove *.exp with *.so.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5975 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   | 9 +++++++++
 lib/mkmf.rb | 9 ++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ee06522d7f..8555ef36dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Mar 19 11:31:32 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb ($beos, $solaris): add OS flags.
+
+	* lib/mkmf.rb (RUBY): / is not recognized as path separator on
+	   nmake/bmake. [ruby-list:39388]
+
+	* lib/mkmf.rb (CLEANLIBS, CLEANOBJS): should remove *.exp with *.so.
+
 Thu Mar 18 19:47:44 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* instruby.rb, rubytest.rb: do not depend on srcdir.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 7561edaad9..7ebd28941d 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -53,6 +53,8 @@ $cygwin = /cygwin/ =~ RUBY_PLATFORM
 $human = /human/ =~ RUBY_PLATFORM
 $netbsd = /netbsd/ =~ RUBY_PLATFORM
 $os2 = /os2/ =~ RUBY_PLATFORM
+$beos = /beos/ =~ RUBY_PLATFORM
+$solaris = /solaris/ =~ RUBY_PLATFORM
 
 def config_string(key, config = CONFIG)
   s = config[key] and !s.empty? and block_given? ? yield(s) : s
@@ -774,7 +776,8 @@ RUBY_SO_NAME = #{CONFIG['RUBY_SO_NAME']}
 arch = #{CONFIG['arch']}
 sitearch = #{CONFIG['sitearch']}
 ruby_version = #{Config::CONFIG['ruby_version']}
-RUBY = #{$ruby}
+ruby = #{$ruby}
+RUBY = #{($nmake && !$extmk && !$configure_args.has_key?('--ruby')) ? '$(ruby:/=\)' : '$(ruby)'}
 RM = #{config_string('RM') || '$(RUBY) -run -e rm -- -f'}
 MAKEDIRS = $(RUBY) -run -e mkdir -- -p
 INSTALL_PROG = $(RUBY) -run -e install -- -vpm 0755
@@ -895,8 +898,8 @@ RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
 }
   end
   mfile.print %{
-CLEANLIBS     = #{$extout ? '$(RUBYARCHDIR)/' : ''}$(TARGET).{#{CONFIG['DLEXT']},exp,il?,tds,map}
-CLEANOBJS     = *.#{$OBJEXT} *.#{$LIBEXT} *.s[ol] *.pdb *.bak
+CLEANLIBS     = #{$extout ? '$(RUBYARCHDIR)/' : ''}$(TARGET).{#{CONFIG['DLEXT']},il?,tds,map}
+CLEANOBJS     = *.#{$OBJEXT} *.#{$LIBEXT} *.s[ol] *.pdb *.exp *.bak
 
 all:		#{target ? $extout ? "install" : "$(DLLIB)" : "Makefile"}
 static:		$(STATIC_LIB)