usa	2018-06-10 17:59:17 +0900 (Sun, 10 Jun 2018)

  New Revision: 63626

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=63626

  Log:
    merge revision(s) 58455:
    
    use $(srcdir).
    
    * win32/Makefile.sub (enc/jis/props.h): build it in not builddir,
      but in srcdir.

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/version.h
    branches/ruby_2_4/win32/Makefile.sub
Index: ruby_2_4/win32/Makefile.sub
===================================================================
--- ruby_2_4/win32/Makefile.sub	(revision 63625)
+++ ruby_2_4/win32/Makefile.sub	(revision 63626)
@@ -1147,7 +1147,7 @@ $(ruby_pc): $(RBCONFIG) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/win32/Makefile.sub#L1147
 lex.c: {$(srcdir)}lex.c.blt
 	copy $(?:/=\) $@
 
-enc/jis/props.h: {$(srcdir)}enc/jis/props.h.blt
+$(srcdir)/enc/jis/props.h: {$(srcdir)}enc/jis/props.h.blt
 	@if not exist $(@D:/=\) md $(@D:/=\)
 	$(ECHO) copying $@
 	$(Q) copy $(?:/=\) $(@:/=\) > nul
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 63625)
+++ ruby_2_4/version.h	(revision 63626)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.5"
-#define RUBY_RELEASE_DATE "2018-03-29"
-#define RUBY_PATCHLEVEL 297
+#define RUBY_RELEASE_DATE "2018-06-10"
+#define RUBY_PATCHLEVEL 298
 
 #define RUBY_RELEASE_YEAR 2018
-#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 29
+#define RUBY_RELEASE_MONTH 6
+#define RUBY_RELEASE_DAY 10
 
 #include "ruby/version.h"
 
Index: ruby_2_4
===================================================================
--- ruby_2_4	(revision 63625)
+++ ruby_2_4	(revision 63626)

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r58455

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