diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -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 @@ -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 index e19b415e78..92136a0ed3 100644 --- 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 |