summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-17 03:21:27 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-17 03:21:27 +0000
commit9cbc37f505994abe7e956c5a8e2dcc1c58d9d150 (patch)
treeb004f15fb5226a83cd4ac9bae42832b7d19fdf1d
parentc392e6e66603853e4b0880d9b86c559e0e9f0e0f (diff)
* Makefile.in (RUNRUBY): added RUNRUBYOPT.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14253 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in2
-rw-r--r--configure.in2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 872c754110..58b9381c36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Dec 17 12:21:25 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * Makefile.in (RUNRUBY): added RUNRUBYOPT.
+
Mon Dec 17 11:38:59 2007 Tanaka Akira <akr@fsij.org>
* thread_win32.ci (native_thread_create): initialize
diff --git a/Makefile.in b/Makefile.in
index 8dbb27f74f..32b698a0df 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,7 +59,7 @@ EXEEXT = @EXEEXT@
PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
RUBY = $(RUBY_INSTALL_NAME)
MINIRUBY = @MINIRUBY@ $(MINIRUBYOPT)
-RUNRUBY = @RUNRUBY@
+RUNRUBY = @RUNRUBY@ $(RUNRUBYOPT) --
#### End of system configuration section. ####
diff --git a/configure.in b/configure.in
index a011b38fa4..c352118fd7 100644
--- a/configure.in
+++ b/configure.in
@@ -1314,7 +1314,7 @@ if test x"$cross_compiling" = xyes; then
else
MINIRUBY='./miniruby$(EXEEXT)'
PREP='miniruby$(EXEEXT)'
- RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT) --'
+ RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)'
fi
AC_SUBST(MINIRUBY)
AC_SUBST(PREP)