diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-06-10 08:59:17 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-06-10 08:59:17 +0000 |
| commit | bd4ba72a2504ae0123b562cf9203f854837d623c (patch) | |
| tree | 081a171694f81597d7a506cb1ab87d2d0b9daae2 | |
| parent | 753aa75319282297c41a02d9932b5d88ba575112 (diff) | |
merge revision(s) 58455:
use $(srcdir).
* win32/Makefile.sub (enc/jis/props.h): build it in not builddir,
but in srcdir.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@63626 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | version.h | 8 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
2 files changed, 5 insertions, 5 deletions
@@ -1,10 +1,10 @@ #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" diff --git a/win32/Makefile.sub b/win32/Makefile.sub index dc198f63d2..38139fb74f 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1147,7 +1147,7 @@ $(ruby_pc): $(RBCONFIG) 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 |