From d042ab1adcc5cd1cc9a23de15ffeb9357d47732a Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 3 Aug 2005 23:04:16 +0000
Subject: [PATCH] * ext/extmk.rb (extmake): should not modify $mflags for each 
  extentions.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8903 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    | 5 +++++
 ext/extmk.rb | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a5c12d528b..bd4d18fc05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug  4 08:03:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): should not modify $mflags for each
+	  extentions.
+
 Thu Aug  4 00:25:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk, Makefile.in, {bcc32,win32,wince}/Makefile.sub: integrated
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 04cefd767b..cb44c5e4ac 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -158,7 +158,7 @@ def extmake(target)
     end
     args = sysquote($mflags)
     unless $destdir.to_s.empty? or $mflags.include?("DESTDIR")
-      args << sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))
+      args += sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))
     end
     if $static
       args += ["static"] unless $clean
@@ -428,7 +428,7 @@ SRC
   $extpath.delete("$(topdir)")
   $extflags = libpathflag($extpath) << " " << $extflags.strip
   conf = [
-    ['SETUP', $setup], [$enable_shared ? 'DLDOBJS' : 'EXTOBJS', $extobjs],
+    ['SETUP', $setup], [$enable_shared && !$force_static ? 'DLDOBJS' : 'EXTOBJS', $extobjs],
     ['EXTLIBS', $extlibs.join(' ')], ['EXTLDFLAGS', $extflags]
   ].map {|n, v|
     "#{n}=#{v}" if v and !(v = v.strip).empty?
@@ -455,6 +455,9 @@ puts "making #{rubies.join(', ')}"
 $stdout.flush
 $mflags.concat(rubies)
 
+if $nmake == ?b
+  $mflags.collect {|flag| flag.sub!(/\A(?=\w+=)/, "-D")}
+end
 system($make, *sysquote($mflags)) or exit($?.exitstatus)
 
 #Local variables: