summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-25 16:32:15 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-25 16:32:15 +0000
commitc85ad557c2e73d2980fae6733eaaa648ef5b6f89 (patch)
tree2148b550fd35b360d7235e5c3ad59504dae10cb7
parentb07db805891d731f19bb0034988f1ebe56eb5e1e (diff)
merges r20088 from trunk into ruby_1_9_1.
win32/Makefile.sub: add RUNRUBYOPT. [ruby-dev:37009] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21050 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--win32/Makefile.sub2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ab174024b..7771eb3d03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Nov 2 22:06:55 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * win32/Makefile.sub: add RUNRUBYOPT. [ruby-dev:37009]
+
Thu Dec 25 17:49:45 2008 NARUSE, Yui <naruse@ruby-lang.org>
* transcode.c (decorate_convpath): show type of escaping for
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index eece6f9148..96dbfebc8e 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -217,7 +217,7 @@ MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib
RUNRUBY = .\$(PROGRAM) -I$(srcdir)/lib -I"$(EXTOUT)/$(arch)"
!endif
MINIRUBY = $(MINIRUBY) $(MINIRUBYOPT)
-RUNRUBY = $(RUNRUBY) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
+RUNRUBY = $(RUNRUBY) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" $(RUNRUBYOPT) --
!ifndef RUBY
RUBY = ruby
!endif