merge revision(s) 40783 (partially): [Backport ruby#8413]

nagachika · nagachika · commit b41becd2f080 · 2013-06-08T17:03:42.000Z
* win32/Makefile.sub (config.status): fix typo.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41191 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jun  9 01:59:39 2013  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+merge revision 40783 (partially): [Backport #8413]
+
+	* win32/Makefile.sub: fix a typo in config.h.
+
 Sun Jun  9 01:38:55 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
 	* intern.h: remove dangling rb_class_init_copy declaration
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-06-09"
-#define RUBY_PATCHLEVEL 211
+#define RUBY_PATCHLEVEL 212
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 6
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
@@ -855,7 +855,7 @@ s,@sitedir@,$${rubylibprefix}/site_ruby,;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}/$${sitearch},;t t
+s,@vendorarchdir@,$${vendorlibdir}/$${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

-Original file line number
+Diff line change
@@ @@ -1,3 +1,9 @@ @@
 +Sun Jun  9 01:59:39 2013  CHIKANAGA Tomoyuki  <[email protected]>
++
 +merge revision 40783 (partially): [Backport #8413]
++
 +	* win32/Makefile.sub: fix a typo in config.h.
++
 Sun Jun  9 01:38:55 2013  Charlie Somerville  <[email protected]>
 	* intern.h: remove dangling rb_class_init_copy declaration