nobu	2009-09-10 23:00:47 +0900 (Thu, 10 Sep 2009)

  New Revision: 24829

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

  Log:
    * lib/mkmf.rb (create_makefile): fix for parallel execution.
      [ruby-core:25509]

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/mkmf.rb
    branches/ruby_1_8/version.h
    trunk/ChangeLog
    trunk/lib/mkmf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24828)
+++ ChangeLog	(revision 24829)
@@ -1,3 +1,8 @@
+Thu Sep 10 23:00:45 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (create_makefile): fix for parallel execution.
+	  [ruby-core:25509]
+
 Thu Sep 10 21:22:01 2009  Tanaka Akira  <akr@f...>
 
 	* test/dl/test_cptr.rb (test_free=): test SEGV at first.
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 24828)
+++ lib/mkmf.rb	(revision 24829)
@@ -1,3 +1,4 @@
+# -*- indent-tabs-mode: t -*-
 # module to create Makefile for extension modules
 # invoke like: ruby -r mkmf extconf.rb
 
@@ -1759,8 +1760,8 @@
       mfile.print "\t@-$(RM) #{fseprepl[dest]}\n"
       mfile.print "\t@-$(RMDIRS) #{fseprepl[dir]}\n"
     else
-      mfile.print "#{dest}: #{dir} #{f}\n"
-      mfile.print "\t$(INSTALL_PROG) #{fseprepl[f]} #{fseprepl[dir]}\n"
+      mfile.print "#{dest}: #{f}\n\t@-$(MAKEDIRS) $(@D#{sep})\n"
+      mfile.print "\t$(INSTALL_PROG) #{fseprepl[f]} $(@D#{sep})\n"
       if defined?($installed_list)
 	mfile.print "\t@echo #{dir}/#{File.basename(f)}>>$(INSTALLED_LIST)\n"
       end
@@ -1782,8 +1783,8 @@
       for f in files
 	dest = "#{dir}/#{File.basename(f)}"
 	mfile.print("install-rb#{sfx}: #{dest}\n")
-	mfile.print("#{dest}: #{f} #{dir}\n\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) ")
-	mfile.print("#{f} $(@D)\n")
+	mfile.print("#{dest}: #{f}\n\t@-$(MAKEDIRS) $(@D#{sep})\n")
+	mfile.print("\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} $(@D#{sep})\n")
 	if defined?($installed_list) and !$extout
 	  mfile.print("\t@echo #{dest}>>$(INSTALLED_LIST)\n")
 	end
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 24828)
+++ ruby_1_8/ChangeLog	(revision 24829)
@@ -1,3 +1,8 @@
+Thu Sep 10 23:00:45 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (create_makefile): fix for parallel execution.
+	  [ruby-core:25509]
+
 Sat Sep  5 06:29:22 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (rb_io_binmode): check if closed regardless platforms.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 24828)
+++ ruby_1_8/version.h	(revision 24829)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2009-09-05"
+#define RUBY_RELEASE_DATE "2009-09-10"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20090905
+#define RUBY_RELEASE_CODE 20090910
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 10
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/lib/mkmf.rb
===================================================================
--- ruby_1_8/lib/mkmf.rb	(revision 24828)
+++ ruby_1_8/lib/mkmf.rb	(revision 24829)
@@ -1,3 +1,4 @@
+# -*- indent-tabs-mode: t -*-
 # module to create Makefile for extension modules
 # invoke like: ruby -r mkmf extconf.rb
 
@@ -1549,7 +1550,8 @@
         dir.gsub!(/(\$\(\w+)(\))/) {$1+sep+$2}
         dir.gsub!(/(\$\{\w+)(\})/) {$1+sep+$2}
       end
-      mfile.print "\t$(INSTALL_PROG) #{f} #{dir}\n"
+      mfile.print "\t@-$(MAKEDIRS) $(@D#{sep})\n"
+      mfile.print "\t$(INSTALL_PROG) #{f} $(@D#{sep})\n"
       if defined?($installed_list)
 	mfile.print "\t@echo #{dir}/#{File.basename(f)}>>$(INSTALLED_LIST)\n"
       end
@@ -1571,8 +1573,8 @@
       files.each do |f|
 	dest = "#{dir}/#{File.basename(f)}"
 	mfile.print("install-rb#{sfx}: #{dest}\n")
-	mfile.print("#{dest}: #{f} #{dir}\n\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) ")
-	mfile.print("#{f} $(@D)\n")
+	mfile.print("#{dest}: #{f}\n\t@-$(MAKEDIRS) $(@D#{sep})\n")
+	mfile.print("\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} $(@D#{sep})\n")
 	if defined?($installed_list) and !$extout
 	  mfile.print("\t@echo #{dest}>>$(INSTALLED_LIST)\n")
 	end

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