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_4@59402 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2017-07-23 07:46:05 +00:00
parent e9ef3cfdf8
commit b1b4772f0b
2 changed files with 2 additions and 2 deletions

View file

@ -2306,7 +2306,7 @@ CLEANOBJS = *.#{$OBJEXT} #{config_string('cleanobjs') {|t| t.gsub(/\$\*/, "$
mfile.puts(conf) mfile.puts(conf)
mfile.print " mfile.print "
all: #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"} 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: all install static install-so install-rb
.PHONY: clean clean-so clean-static clean-rb .PHONY: clean clean-so clean-static clean-rb
" #" " #"

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.4.2" #define RUBY_VERSION "2.4.2"
#define RUBY_RELEASE_DATE "2017-07-23" #define RUBY_RELEASE_DATE "2017-07-23"
#define RUBY_PATCHLEVEL 153 #define RUBY_PATCHLEVEL 154
#define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 7 #define RUBY_RELEASE_MONTH 7