ruby-changes:47162
From: usa <ko1@a...>
Date: Fri, 7 Jul 2017 15:00:10 +0900 (JST)
Subject: [ruby-changes:47162] usa:r59277 (ruby_2_3): merge revision(s) 57446: [Backport #13413]
usa 2017-07-07 15:00:04 +0900 (Fri, 07 Jul 2017) New Revision: 59277 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=59277 Log: merge revision(s) 57446: [Backport #13413] mkmf.rb: fix script installation * lib/mkmf.rb (MakeMakefile): fix condition to install script files. Modified directories: branches/ruby_2_3/ Modified files: branches/ruby_2_3/lib/mkmf.rb branches/ruby_2_3/version.h Index: ruby_2_3/lib/mkmf.rb =================================================================== --- ruby_2_3/lib/mkmf.rb (revision 59276) +++ ruby_2_3/lib/mkmf.rb (revision 59277) @@ -2295,7 +2295,7 @@ CLEANLIBS = #{n}.#{CONFIG['DLEXT']} https://github.com/ruby/ruby/blob/trunk/ruby_2_3/lib/mkmf.rb#L2295 CLEANOBJS = *.#{$OBJEXT} #{config_string('cleanobjs') {|t| t.gsub(/\$\*/, "$(TARGET)#{deffile ? '-$(arch)': ''}")} if target} *.bak all: #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"} -static: #{$extmk && !$static ? "all" : "$(STATIC_LIB)#{!$extmk ? " install-rb" : ""}"} +static: #{$extmk && !$static ? "all" : "$(STATIC_LIB)#{$extout ? " install-rb" : ""}"} .PHONY: all install static install-so install-rb .PHONY: clean clean-so clean-static clean-rb " Index: ruby_2_3/version.h =================================================================== --- ruby_2_3/version.h (revision 59276) +++ ruby_2_3/version.h (revision 59277) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1 #define RUBY_VERSION "2.3.5" #define RUBY_RELEASE_DATE "2017-07-07" -#define RUBY_PATCHLEVEL 341 +#define RUBY_PATCHLEVEL 342 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 7 Index: ruby_2_3 =================================================================== --- ruby_2_3 (revision 59276) +++ ruby_2_3 (revision 59277) Property changes on: ruby_2_3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /trunk:r57446 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/