yugui	2009-01-28 18:22:45 +0900 (Wed, 28 Jan 2009)

  New Revision: 21831

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21831

  Log:
    merges r21752 from trunk into ruby_1_9_1.
    * lib/mkmf.rb (configuration): tools under the top source
      directory are not installed, so unusable outside extmk.rb.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/mkmf.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21830)
+++ ruby_1_9_1/ChangeLog	(revision 21831)
@@ -1,3 +1,8 @@
+Sat Jan 24 08:22:35 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (configuration): tools under the top source
+	  directory are not installed, so unusable outside extmk.rb.
+
 Fri Jan 23 17:24:31 2009  WATANABE Hirofumi  <eban@r...>
 
 	* golf_prelude.rb (Enumerator#inspect): avoid warning.
Index: ruby_1_9_1/lib/mkmf.rb
===================================================================
--- ruby_1_9_1/lib/mkmf.rb	(revision 21830)
+++ ruby_1_9_1/lib/mkmf.rb	(revision 21831)
@@ -1367,6 +1367,7 @@
   else
     sep = ""
   end
+  possible_command = (proc {|s| s if /top_srcdir/ !~ s} unless $extmk)
   extconf_h = $extconf_h ? "-DRUBY_EXTCONF_H=\\\"$(RUBY_EXTCONF_H)\\\" " : $defs.join(" ") << " "
   mk << %{
 CC = #{CONFIG['CC']}
@@ -1404,13 +1405,13 @@
 ruby_version = #{RbConfig::CONFIG['ruby_version']}
 ruby = #{$ruby}
 RUBY = $(ruby#{sep})
-RM = #{config_string('RM') || '$(RUBY) -run -e rm -- -f'}
+RM = #{config_string('RM', &possible_command) || '$(RUBY) -run -e rm -- -f'}
 RM_RF = #{'$(RUBY) -run -e rm -- -rf'}
-MAKEDIRS = #{config_string('MAKEDIRS') || '@$(RUBY) -run -e mkdir -- -p'}
-INSTALL = #{config_string('INSTALL') || '@$(RUBY) -run -e install -- -vp'}
+MAKEDIRS = #{config_string('MAKEDIRS', &possible_command) || '@$(RUBY) -run -e mkdir -- -p'}
+INSTALL = #{config_string('INSTALL', &possible_command) || '@$(RUBY) -run -e install -- -vp'}
 INSTALL_PROG = #{config_string('INSTALL_PROG') || '$(INSTALL) -m 0755'}
 INSTALL_DATA = #{config_string('INSTALL_DATA') || '$(INSTALL) -m 0644'}
-COPY = #{config_string('CP') || '@$(RUBY) -run -e cp -- -v'}
+COPY = #{config_string('CP', &possible_command) || '@$(RUBY) -run -e cp -- -v'}
 
 #### End of system configuration section. ####
 
@@ -1682,7 +1683,7 @@
   mfile.print("install-rb-default: pre-install-rb-default\n")
   mfile.print("pre-install-rb: Makefile\n")
   mfile.print("pre-install-rb-default: Makefile\n")
-  fsep = config_string('BUILD_FILE_SEPARATOR')
+  fsep = config_string('BUILD_FILE_SEPARATOR') {|s| s unless s == "/"}
   sep = fsep ? ":/=#{fsep}" : ""
   for sfx, i in [["-default", [["lib/**/*.rb", "$(RUBYLIBDIR)", "lib"]]], ["", $INSTALLFILES]]
     files = install_files(mfile, i, nil, srcprefix) or next
@@ -1739,7 +1740,6 @@
     end
   end
 
-  sep = config_string('BUILD_FILE_SEPARATOR') {|s| ":/=#{s}" if s != "/"} || ""
   mfile.print "$(RUBYARCHDIR)/" if $extout
   mfile.print "$(DLLIB): "
   mfile.print "$(DEFFILE) " if makedef

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