nobu	2016-09-18 14:21:05 +0900 (Sun, 18 Sep 2016)

  New Revision: 56180

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

  Log:
    mkmf.rb: fix for bundled gems
    
    * lib/mkmf.rb (install_dirs): enable extout in RUBYARCHDIR only
      when extmk.
    
    * lib/mkmf.rb (create_makefile): ditto for TIMESTAMP_DIR.

  Modified files:
    trunk/lib/mkmf.rb
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 56179)
+++ lib/mkmf.rb	(revision 56180)
@@ -176,7 +176,7 @@ module MakeMakefile https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L176
   ]
 
   def install_dirs(target_prefix = nil)
-    if $extout
+    if $extout and $extmk
       dirs = [
         ['BINDIR',        '$(extout)/bin'],
         ['RUBYCOMMONDIR', '$(extout)/common'],
@@ -2288,7 +2288,7 @@ DLLIB = #{dllib} https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2288
 EXTSTATIC = #{$static || ""}
 STATIC_LIB = #{staticlib unless $static.nil?}
 #{!$extout && defined?($installed_list) ? "INSTALLED_LIST = #{$installed_list}\n" : ""}
-TIMESTAMP_DIR = #{$extout ? '$(extout)/.timestamp' : '.'}
+TIMESTAMP_DIR = #{$extout && $extmk ? '$(extout)/.timestamp' : '.'}
 " #"
     # TODO: fixme
     install_dirs.each {|d| conf << ("%-14s= %s\n" % d) if /^[[:upper:]]/ =~ d[0]}

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