summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-14 08:38:00 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-14 08:38:00 +0000
commitfac59ac780d6fba2107d2d74c7d2553c0cc81af9 (patch)
tree2a0a1d578073f3d46c111a7198b3b210616367c2
parentf150dbba6b1a07aeee9dc93c6da3a34c63086fb2 (diff)
* common.mk: need to quote $BASERUBY because it may includes options.
this change is only for release management, not bug fix. [Backport #9837] [ruby-dev:48218] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@45941 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--common.mk2
-rw-r--r--version.h8
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 17715d02b4..0883f56e2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed May 14 17:35:32 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * common.mk: need to quote $BASERUBY because it may includes options.
+ this change is only for release management, not bug fix.
+ [Backport #9837] [ruby-dev:48218]
+
Mon Mar 31 15:38:07 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/openssl/ossl.c (ossl_make_error): check NULL for unknown
diff --git a/common.mk b/common.mk
index b26ba729c3..2e574926c1 100644
--- a/common.mk
+++ b/common.mk
@@ -863,7 +863,7 @@ $(REVISION_H): $(srcdir)/version.h $(srcdir)/ChangeLog $(srcdir)/tool/file2lastr
$(srcdir)/ext/ripper/ripper.c: parse.y
$(ECHO) generating $@
$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \
- Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. RUBY=$(BASERUBY)
+ Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. RUBY="$(BASERUBY)"
$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl
$(ECHO) generating $@
diff --git a/version.h b/version.h
index aa87e82662..24ef1f17ab 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 546
+#define RUBY_PATCHLEVEL 547
-#define RUBY_RELEASE_DATE "2014-03-31"
+#define RUBY_RELEASE_DATE "2014-05-14"
#define RUBY_RELEASE_YEAR 2014
-#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 31
+#define RUBY_RELEASE_MONTH 5
+#define RUBY_RELEASE_DAY 14
#include "ruby/version.h"