merge revision(s) 36045: [Backport #7637]

	* lib/mkmf.rb: add dummy clean-static target to prevent errors for the
	  case real clean-static target doesn't exist.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38780 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index ae1b43188c..0f4b87676e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 11 17:11:26 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/mkmf.rb: add dummy clean-static target to prevent errors for the
+	  case real clean-static target doesn't exist.
+
 Fri Jan 11 17:02:59 2013  Koichi Sasada  <ko1@atdot.net>
 
 	* vm_exec.h (GENTRY): GENTRY should be pointer size.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 08053a9cb6..7c706e855e 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -2296,6 +2296,7 @@ UNIVERSAL_INTS = config_string('UNIVERSAL_INTS') {|s| Shellwords.shellwords(s)}
 
 sep = config_string('BUILD_FILE_SEPARATOR') {|s| ":/=#{s}" if s != "/"} || ""
 CLEANINGS = "
+clean-static::
 clean-rb-default::
 clean-rb::
 clean-so::
diff --git a/version.h b/version.h
index 3e49529f44..31cdf09240 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 365
+#define RUBY_PATCHLEVEL 366
 
 #define RUBY_RELEASE_DATE "2013-01-11"
 #define RUBY_RELEASE_YEAR 2013