From d45f226da9d3833d7351125b07ebaa9510622804 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 24 Oct 2002 12:58:42 +0000
Subject: * configure.in (LIBPATHFLAG): avoid $ substitution.  
 [ruby-dev:18577]

* ext/extmk.rb (extmake): expand $srcdir.

* ext/win32ole/extconf.rb: should not override $CFLAGS, but
  append.

* lib/mkmf.rb (config_string): use given config hash.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2991 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/win32ole/extconf.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'ext/win32ole/extconf.rb')

diff --git a/ext/win32ole/extconf.rb b/ext/win32ole/extconf.rb
index f627fcabb4..c0dfd4c724 100644
--- a/ext/win32ole/extconf.rb
+++ b/ext/win32ole/extconf.rb
@@ -17,10 +17,8 @@ end
 
 case RUBY_PLATFORM
 when /mswin32/
-  $CFLAGS='/W3'
-when /mingw/
-  $CFLAGS='-DNONAMELESSUNION'
-when /cygwin/
-  $CFLAGS='-DNONAMELESSUNION'
+  $CFLAGS += ' /W3'
+when /cygwin/, /mingw/
+  $defs << '-DNONAMELESSUNION'
 end
 create_win32ole_makefile
-- 
cgit v1.2.3