summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-10 16:01:06 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-10 16:01:06 +0000
commit300b401c60387e72e11163d13ee649f9f60ded02 (patch)
tree34cdbd8ccc2e4e06a581c8a2bafacf11b09ea1ca
parentab4dba0da6730950c23a357e14419b2028cb4d72 (diff)
merge revision(s) 39492: [Backport #6807]
* common.mk (realclean-local): miniprelude.c is made by srcs, so it should not removed by distclean but by realclean. [Bug #6807] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39705 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--common.mk4
-rw-r--r--version.h2
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d9214ba32..cd45ab80af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 11 00:58:30 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (realclean-local): miniprelude.c is made by srcs, so it
+ should not removed by distclean but by realclean. [Bug #6807]
+
Mon Mar 11 00:54:30 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* enc/depend (ARFLAGS): VisualC++ linker does not allow spaces between
diff --git a/common.mk b/common.mk
index 531ba26daa..e5069e5200 100644
--- a/common.mk
+++ b/common.mk
@@ -454,7 +454,7 @@ clean-docs: clean-rdoc clean-capi
distclean: distclean-ext distclean-local distclean-enc distclean-golf distclean-extout distclean-platform
distclean-local:: clean-local
$(Q)$(RM) $(MKFILES) yasmdata.rb *.inc
- $(Q)$(RM) config.cache config.status config.status.lineno $(PRELUDES)
+ $(Q)$(RM) config.cache config.status config.status.lineno
$(Q)$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP)
distclean-ext:: PHONY
distclean-golf: clean-golf
@@ -466,7 +466,7 @@ distclean-platform: clean-platform
realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
realclean-local:: distclean-local
- $(Q)$(RM) parse.c parse.h lex.c newline.c revision.h
+ $(Q)$(RM) parse.c parse.h lex.c newline.c miniprelude.c revision.h
realclean-ext::
realclean-golf: distclean-golf
realclean-capi: PHONY
diff --git a/version.h b/version.h
index 1b5fc3b740..2974f7a24f 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-03-11"
-#define RUBY_PATCHLEVEL 49
+#define RUBY_PATCHLEVEL 50
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 3