nobu	2013-02-11 13:15:14 +0900 (Mon, 11 Feb 2013)

  New Revision: 39201

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39201

  Log:
    Makefile.sub: sitearch
    
    * win32/Makefile.sub (config.status): site and vendor directories
      should use sitearch, not arch.  [ruby-dev:46964] [Bug #7823]

  Added files:
    trunk/test/test_rbconfig.rb
  Modified files:
    trunk/ChangeLog
    trunk/win32/Makefile.sub

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 39200)
+++ ChangeLog	(revision 39201)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Feb 11 13:15:11 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* win32/Makefile.sub (config.status): site and vendor directories
+	  should use sitearch, not arch.  [ruby-dev:46964] [Bug #7823]
+
 Mon Feb 11 12:31:25 2013  Tanaka Akira  <akr@f...>
 
 	* configure.in: move OS specific header/function knowledge before
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 39200)
+++ win32/Makefile.sub	(revision 39201)
@@ -852,10 +852,10 @@ s,@rubylibprefix@,$${prefix}/lib/$${RUBY https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L852
 s,@rubyarchdir@,$${rubylibdir}/$${arch},;t t
 s,@rubylibdir@,$${rubylibprefix}/$${ruby_version},;t t
 s,@sitedir@,$${rubylibprefix}/site_ruby,;t t
-s,@sitearchdir@,$${sitelibdir}/$${arch},;t t
+s,@sitearchdir@,$${sitelibdir}/$${sitearch},;t t
 s,@sitelibdir@,$${sitedir}/$${ruby_version},;t t
 s,@vendordir@,$${rubylibprefix}/vendor_ruby,;t t
-s,@vendorarchdir@,$${vendirlibdir}/$${arch},;t t
+s,@vendorarchdir@,$${vendirlibdir}/$${sitearch},;t t
 s,@vendorlibdir@,$${vendordir}/$${ruby_version},;t t
 s,@rubyhdrdir@,$$(includedir)/$${RUBY_BASE_NAME}-$$(ruby_version),;t t
 s,@sitehdrdir@,$$(rubyhdrdir)/site_ruby,;t t
Index: test/test_rbconfig.rb
===================================================================
--- test/test_rbconfig.rb	(revision 0)
+++ test/test_rbconfig.rb	(revision 39201)
@@ -0,0 +1,41 @@ https://github.com/ruby/ruby/blob/trunk/test/test_rbconfig.rb#L1
+require 'test/unit'
+require 'rbconfig'
+
+class TestRbConfig < Test::Unit::TestCase
+  def test_sitedirs
+    RbConfig::MAKEFILE_CONFIG.each do |key, val|
+      next unless /\Asite(?!arch)/ =~ key
+      assert_match(/(?:\$\(|\/)site/, val, key)
+    end
+  end
+
+  def test_vendordirs
+    RbConfig::MAKEFILE_CONFIG.each do |key, val|
+      next unless /\Avendor(?!arch)/ =~ key
+      assert_match(/(?:\$\(|\/)vendor/, val, key)
+    end
+  end
+
+  def test_archdirs
+    RbConfig::MAKEFILE_CONFIG.each do |key, val|
+      next unless /\A(?!site|vendor|archdir\z).*arch.*dir\z/ =~ key
+      assert_match(/\$\(arch|\$\(rubyarchprefix\)/, val, key)
+    end
+  end
+
+  def test_sitearchdirs
+    bug7823 = '[ruby-dev:46964] [Bug #7823]'
+    RbConfig::MAKEFILE_CONFIG.each do |key, val|
+      next unless /\Asite.*arch.*dir\z/ =~ key
+      assert_match(/\$\(sitearch|\$\(rubyarchprefix\)/, val, "#{key} #{bug7823}")
+    end
+  end
+
+  def test_vendorarchdirs
+    bug7823 = '[ruby-dev:46964] [Bug #7823]'
+    RbConfig::MAKEFILE_CONFIG.each do |key, val|
+      next unless /\Avendor.*arch.*dir\z/ =~ key
+      assert_match(/\$\(sitearch|\$\(rubyarchprefix\)/, val, "#{key} #{bug7823}")
+    end
+  end
+end

Property changes on: test/test_rbconfig.rb
___________________________________________________________________
Added: svn:eol-style
   + LF


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/