From b9170351da22956db16ae9ed06975d216d414809 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 23 Jan 2009 23:21:16 +0000
Subject: [PATCH] * lib/mkmf.rb (configuration): tools under the top source  
 directory are not installed, so unusable outside extmk.rb.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21752 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   |  5 +++++
 lib/mkmf.rb | 12 ++++++------
 version.h   |  4 ++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4b318d1522..1ccacf002e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jan 24 08:22:35 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* golf_prelude.rb (Enumerator#inspect): avoid warning.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index da84cb85cc..e3fd6ea619 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1367,6 +1367,7 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
   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 @@ sitearch = #{CONFIG['sitearch']}
 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 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
   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 @@ site-install-rb: install-rb
     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
diff --git a/version.h b/version.h
index 0f1cc38268..b07aee3542 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_RELEASE_DATE "2009-01-23"
+#define RUBY_RELEASE_DATE "2009-01-24"
 #define RUBY_PATCHLEVEL 5000
 #define RUBY_BRANCH_NAME "trunk"
 
@@ -8,7 +8,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 23
+#define RUBY_RELEASE_DAY 24
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];