From 7f674123f76bdc13c8d38b49e2db774b804aea4d Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 2 Feb 2007 18:35:40 +0000
Subject: * common.mk (runruby, benchmark, benchmark-each, tbench): use  
 PROGRAM for the file to be built.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11623 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog |  5 ++++-
 common.mk | 16 ++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 859cdf36d..3970b0e19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
-Sat Feb  3 03:22:47 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Feb  3 03:35:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* Makefile.in, */Makefile.sub, common.mk (vmasm): generalized.
 
+	* common.mk (runruby, benchmark, benchmark-each, tbench): use
+	  PROGRAM for the file to be built.
+
 	* proc.c (yarv_proc_alloc): needs return.
 
 	* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
diff --git a/common.mk b/common.mk
index d9980916e..7fde34b98 100644
--- a/common.mk
+++ b/common.mk
@@ -594,20 +594,20 @@ compare-test-each: miniruby$(EXEEXT) PHONY
 run: miniruby$(EXEEXT) PHONY
 	$(MINIRUBY) -I$(srcdir)/lib $(srcdir)/test.rb $(RUNOPT)
 
-runruby: $(RUBY) PHONY
-	./$(RUBY)  -I$(srcdir)/lib -I. $(srcdir)/tool/runruby.rb $(srcdir)/test.rb
+runruby: $(PROGRAM) PHONY
+	$(RUNRUBY) $(srcdir)/test.rb
 
 parse: miniruby$(EXEEXT) PHONY
 	$(MINIRUBY) $(srcdir)/tool/parse.rb $(srcdir)/test.rb
 
-benchmark: $(RUBY) PHONY
-	$(BASERUBY) -I$(srcdir)/lib $(srcdir)/benchmark/run.rb $(OPT) $(ITEMS) --ruby=./$(RUBY) --matzruby=$(MATZRUBY) --opts=-I$(srcdir)/lib
+benchmark: $(PROGRAM) PHONY
+	$(BASERUBY) -I$(srcdir)/lib $(srcdir)/benchmark/run.rb $(OPT) $(ITEMS) --ruby=./$(PROGRAM) --matzruby=$(MATZRUBY) --opts=-I$(srcdir)/lib
 
-benchmark-each: $(RUBY) PHONY
-	$(BASERUBY) -I$(srcdir)/lib $(srcdir)/benchmark/run.rb bm_$(ITEM) $(OPT) --ruby=./$(RUBY) --matzruby=$(MATZRUBY) --opts=-I$(srcdir)/lib
+benchmark-each: $(PROGRAM) PHONY
+	$(BASERUBY) -I$(srcdir)/lib $(srcdir)/benchmark/run.rb bm_$(ITEM) $(OPT) --ruby=./$(PROGRAM) --matzruby=$(MATZRUBY) --opts=-I$(srcdir)/lib
 
-tbench: $(RUBY) PHONY
-	$(BASERUBY) -I$(srcdir)/lib $(srcdir)/benchmark/run.rb bmx $(OPT) --ruby=./$(RUBY) --matzruby=$(MATZRUBY) --opts=-I$(srcdir)/lib
+tbench: $(PROGRAM) PHONY
+	$(BASERUBY) -I$(srcdir)/lib $(srcdir)/benchmark/run.rb bmx $(OPT) --ruby=./$(PROGRAM) --matzruby=$(MATZRUBY) --opts=-I$(srcdir)/lib
 
 aotc:
 	$(RUBY) -I$(srcdir) -I. $(srcdir)/tool/aotcompile.rb $(INSNS2VMOPT)
-- 
cgit