diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-07 06:00:04 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-07 06:00:04 +0000 |
| commit | e1f73c3219a9fb9bc286468c286b582cbca4821e (patch) | |
| tree | c68a30dc043dadfd3f414c189438df2d625aaff4 | |
| parent | 651990fa73ac02d5342e7f9620ce7c620aecec15 (diff) | |
merge revision(s) 57446: [Backport #13413]
mkmf.rb: fix script installation
* lib/mkmf.rb (MakeMakefile): fix condition to install script
files.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59277 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | lib/mkmf.rb | 2 | ||||
| -rw-r--r-- | version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 3181b058ab..68f0b39216 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -2295,7 +2295,7 @@ CLEANLIBS = #{n}.#{CONFIG['DLEXT']} #{config_string('cleanlibs') {|t| t.gsub 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 " @@ -1,6 +1,6 @@ #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 |