From 18caa8f178c971ff61ccc4c5730c657a2bac3e84 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 26 Jan 2003 10:29:05 +0000
Subject: * instruby.rb ($mflags.set?): Check $make instead of $nmake, sinse  
 there is no such a variable.

* instruby.rb ($mflags.set?), ext/extmk.rb ($mflags.set?): Return
  false if unmatched.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3414 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    | 8 ++++++++
 ext/extmk.rb | 1 +
 instruby.rb  | 3 ++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index cda29cc593..a5f1b2f16a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Jan 26 19:23:10 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* instruby.rb ($mflags.set?): Check $make instead of $nmake, sinse
+	  there is no such a variable.
+
+	* instruby.rb ($mflags.set?), ext/extmk.rb ($mflags.set?): Return
+	  false if unmatched.
+
 Sun Jan 26 17:53:04 2003  Akinori MUSHA  <knu@iDaemons.org>
 
 	* instruby.rb (parse_args), ext/extmk.rb (parse_args): Detect -n
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 46a17074f4..5e13d9ffb0 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -140,6 +140,7 @@ def parse_args()
     # Only nmake puts flags together
     if $nmake == ?m
       grep(/^-(?!-).*#{'%c' % flag}/i) { return true }
+      false
     else
       include?('-%c' % flag)
     end
diff --git a/instruby.rb b/instruby.rb
index e69ec072c4..fc8639f112 100644
--- a/instruby.rb
+++ b/instruby.rb
@@ -36,8 +36,9 @@ def parse_args()
 
   def $mflags.set?(flag)
     # Only nmake puts flags together
-    if $nmake == ?m
+    if /nmake/ =~ $make
       grep(/^-(?!-).*#{'%c' % flag}/i) { return true }
+      false
     else
       include?('-%c' % flag)
     end
-- 
cgit v1.2.3