From c260a0c70c0eb6fa3608eaab6372e867afac56a7 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 7 Aug 2010 05:19:29 +0000
Subject: * lib/mkmf.rb: change instance variable to global.

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

diff --git a/ChangeLog b/ChangeLog
index 1578877da5..4e0d76b21d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Aug  7 14:08:44 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/mkmf.rb: change instance variable to global.
+
 Sat Aug  7 13:59:19 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/pathname/pathname.c (path_sub_ext): don't clobber shared string.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index f8ca103d11..4cf84c6623 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -17,6 +17,7 @@ SRC_EXT = %w[c m].concat(CXX_EXT)
 $static = nil
 $config_h = '$(arch_hdrdir)/ruby/config.h'
 $default_static = $static
+$ignore_error = $nmake ? '' : ' 2> /dev/null || true'
 
 unless defined? $configure_args
   $configure_args = {}
@@ -1813,7 +1814,6 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
   mfile.print "install: install-so install-rb\n\n"
   sodir = (dir = "$(RUBYARCHDIR)").dup
   mfile.print("install-so: ")
-  @ignore_error = $nmake ? '' : ' 2> /dev/null || true'
   if target
     f = "$(DLLIB)"
     dest = "#{dir}/#{f}"
@@ -1821,7 +1821,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
     if $extout
       mfile.print "clean-so::\n"
       mfile.print "\t@-$(RM) #{fseprepl[dest]}\n"
-      mfile.print "\t@-$(RMDIRS) #{fseprepl[dir]}#{@ignore_error}\n"
+      mfile.print "\t@-$(RMDIRS) #{fseprepl[dir]}#{$ignore_error}\n"
     else
       mfile.print "#{dest}: #{f}\n\t@-$(MAKEDIRS) $(@D#{sep})\n"
       mfile.print "\t$(INSTALL_PROG) #{fseprepl[f]} $(@D#{sep})\n"
@@ -1862,7 +1862,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
       unless dirs.empty?
         mfile.print("clean-rb#{sfx}::\n")
         for dir in dirs.sort_by {|d| -d.count('/')}
-          mfile.print("\t@-$(RMDIRS) #{fseprepl[dir]}#{@ignore_error}\n")
+          mfile.print("\t@-$(RMDIRS) #{fseprepl[dir]}#{$ignore_error}\n")
         end
       end
     end
@@ -2096,7 +2096,7 @@ distclean-so::
 distclean: clean distclean-so distclean-rb-default distclean-rb
 \t\t@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
 \t\t@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep})
-\t\t@-$(RMDIRS) $(DISTCLEANDIRS#{sep})#{@ignore_error}
+\t\t@-$(RMDIRS) $(DISTCLEANDIRS#{sep})#{$ignore_error}
 
 realclean: distclean
 "
-- 
cgit v1.2.3