summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-06 06:08:37 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-06 06:08:37 +0000
commit6aac0579d1920fe3be0a12cd2a0775036d576220 (patch)
tree02da3ea480b28541abec7ee6a51f3311a731af53
parentd1cd806372d04675e9f646f1c1e01ef97e103ecc (diff)
* {bcc32,win32}/Makefile.sub (RUNRUBY): use $(PROGRAM) instead of
ruby$(EXEEXT). suggested by KIMURA Koichi <kimura.koichi at canon.co.jp>. [ruby-dev:34000] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15709 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--bcc32/Makefile.sub2
-rw-r--r--win32/Makefile.sub2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b925ebcf61..f88a4f3d4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Mar 6 15:05:25 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * {bcc32,win32}/Makefile.sub (RUNRUBY): use $(PROGRAM) instead of
+ ruby$(EXEEXT).
+ suggested by KIMURA Koichi <kimura.koichi at canon.co.jp>.
+ [ruby-dev:34000]
+
Thu Mar 6 14:46:08 2008 Tanaka Akira <akr@fsij.org>
* missing/lgamma_r.c (loggamma): return 0 for 1 and 2.
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 3a35952162..9652504c6e 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -181,7 +181,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) -i"$(EXTOUT)/$(arch)" "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
+RUNRUBY = .\$(PROGRAM) -i"$(EXTOUT)/$(arch)" "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
ORGLIBPATH = $(LIB)
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index ceb867e6a4..b5f7a0d40c 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -208,7 +208,7 @@ MINIRUBY = $(RUBY) -I$(MAKEDIR) -rfake
RUNRUBY = $(MINIRUBY)
!else
MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib
-RUNRUBY = .\ruby$(EXEEXT) -I"$(EXTOUT)/$(arch)"
+RUNRUBY = .\$(PROGRAM) -I"$(EXTOUT)/$(arch)"
!endif
MINIRUBY = $(MINIRUBY) $(MINIRUBYOPT)
RUNRUBY = $(RUNRUBY) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --