From 4f703c7dad3e8f765192bbe3d990f9df3afa3ff6 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 15 Jan 2008 04:55:28 +0000
Subject: [PATCH] 	* {bcc32,win32}/Makefile.sub (RUNRUBY): need to set
 archdir when 	  invoking ruby.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15056 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          | 5 +++++
 bcc32/Makefile.sub | 2 +-
 win32/Makefile.sub | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7d07041b6b..d8fc118e2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 15 13:54:41 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* {bcc32,win32}/Makefile.sub (RUNRUBY): need to set archdir when
+	  invoking ruby.
+
 Tue Jan 15 13:43:18 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* common.mk (us_ascii.o): add dependecies. [ruby-dev:33111]
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 56fe2372ad..130465753f 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -180,7 +180,7 @@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
 WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
 RUBYDEF = $(RUBY_SO_NAME).def
 MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib $(MINIRUBYOPT)
-RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
+RUNRUBY = .\ruby$(EXEEXT) -i"$(EXTOUT)/$(arch)" "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
 
 ORGLIBPATH = $(LIB)
 
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index d0d8a3fc67..f22a9972dd 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -207,7 +207,7 @@ MINIRUBY = $(RUBY) -I$(MAKEDIR) -rfake
 RUNRUBY = $(MINIRUBY)
 !else
 MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib
-RUNRUBY = .\ruby$(EXEEXT)
+RUNRUBY = .\ruby$(EXEEXT) -I"$(EXTOUT)/$(arch)"
 !endif
 MINIRUBY = $(MINIRUBY) $(MINIRUBYOPT)
 RUNRUBY = $(RUNRUBY) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --