nagachika	2017-07-23 16:46:05 +0900 (Sun, 23 Jul 2017)

  New Revision: 59402

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=59402

  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_4/
  Modified files:
    branches/ruby_2_4/lib/mkmf.rb
    branches/ruby_2_4/version.h
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 59401)
+++ ruby_2_4/version.h	(revision 59402)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.2"
 #define RUBY_RELEASE_DATE "2017-07-23"
-#define RUBY_PATCHLEVEL 153
+#define RUBY_PATCHLEVEL 154
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 7
Index: ruby_2_4/lib/mkmf.rb
===================================================================
--- ruby_2_4/lib/mkmf.rb	(revision 59401)
+++ ruby_2_4/lib/mkmf.rb	(revision 59402)
@@ -2306,7 +2306,7 @@ CLEANOBJS     = *.#{$OBJEXT} #{config_st https://github.com/ruby/ruby/blob/trunk/ruby_2_4/lib/mkmf.rb#L2306
     mfile.puts(conf)
     mfile.print "
 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_4
===================================================================
--- ruby_2_4	(revision 59401)
+++ ruby_2_4	(revision 59402)

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r57446

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/