From 3a224dbf45c2bcd8db9c881d671a3080ba16f5c3 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 10 Sep 2009 14:00:47 +0000
Subject: [PATCH] * lib/mkmf.rb (create_makefile): fix for parallel execution. 
  [ruby-core:25509]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24829 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   | 5 +++++
 lib/mkmf.rb | 9 +++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c8abd65f81..166f8f190c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 10 23:00:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): fix for parallel execution.
+	  [ruby-core:25509]
+
 Thu Sep 10 21:22:01 2009  Tanaka Akira  <akr@fsij.org>
 
 	* test/dl/test_cptr.rb (test_free=): test SEGV at first.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 8d6fc96793..5e9d646e4c 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -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 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
       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 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
       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