From 2672d0cc28ad4a927065097f90e75efa5d950102 Mon Sep 17 00:00:00 2001
From: eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 28 Dec 2002 10:32:05 +0000
Subject: [PATCH] * instruby.rb: remove junk args. * lib/mkmf.rb
 (create_makefile): remove a trouble library   before making a shared library.
 * win32/Makefile.sub: invoke instruby.rb with the --make-flags option.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3233 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          | 9 +++++++++
 instruby.rb        | 1 +
 lib/mkmf.rb        | 1 +
 win32/Makefile.sub | 2 +-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 75213c2210..fd7a15b698 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat Dec 28 19:21:24 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* instruby.rb: remove junk args.
+
+	* lib/mkmf.rb (create_makefile): remove a trouble library
+	  before making a shared library.
+
+	* win32/Makefile.sub: invoke instruby.rb with the --make-flags option.
+
 Sat Dec 28 03:09:58 2002  Wakou Aoyama  <wakou@ruby-lang.org>
 
 	* lib/cgi.rb (CGI#[]): improvement. thanks to Kazuhiro NISHIYAMA
diff --git a/instruby.rb b/instruby.rb
index 5c5b0b400f..4e82a35b91 100644
--- a/instruby.rb
+++ b/instruby.rb
@@ -15,6 +15,7 @@ $dryrun = $OPT["n"]
 Shellwords.shellwords($OPT["make-flags"] || "").grep(/^-[^-]*n/) do
   break $dryrun = true
 end
+ARGV.delete_if{|x|x[0] == ?-}
 destdir = ARGV[0] || ''
 
 include FileUtils::Verbose
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index e61a1e83e6..3ac84ff56b 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -746,6 +746,7 @@ all:		#{target ? "$(DLLIB)" : "Makefile"}
 
   mfile.print "$(DLLIB): $(OBJS)\n\t"
   mfile.print "@-$(RM) $@\n\t"
+  mfile.print "@-$(RM) $(TARGET).lib\n\t" if $mswin
   if $static
     mfile.print "$(AR) #{config_string('ARFLAGS') || 'cru '}$(DLLIB) $(OBJS)"
     if ranlib = config_string('RANLIB')
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index b7fa6d3660..ab0d2acd2d 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -407,7 +407,7 @@ $(RUBYDEF):	$(LIBRUBY_A) miniruby$(EXEEXT)
 		$(AR) $(ARFLAGS)$@ -def:$<
 
 install:	rbconfig.rb
-		$(MINIRUBY) $(srcdir)/instruby.rb -$(MFLAGS)$(MAKEFLAGS) $(DESTDIR)
+		$(MINIRUBY) $(srcdir)/instruby.rb --make-flags "-$(MFLAGS)$(MAKEFLAGS)" $(DESTDIR)
 		$(MINIRUBY) $(srcdir)/ext/extmk.rb --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS) DESTDIR=$(DESTDIR)" install
 
 clean:		clean-ext clean-local