8 files changed, 26 insertions, 10 deletions
@@ -1,3 +1,19 @@
 Fri May 22 05:09:43 2009 Yukihiro Matsumoto <[email protected]>
 * array.c (rb_ary_slice_bang): avoid call of rb_scan_args() unless
@@ -103,7 +103,7 @@ SCRIPT_ARGS =	--dest-dir="$(DESTDIR)" \
 --make-flags="$(MAKEFLAGS)"
 EXTMK_ARGS =	$(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) \
 --make-flags="MINIRUBY='$(MINIRUBY)'" --
-INSTRUBY =	$(MINIRUBY) $(srcdir)/instruby.rb
 INSTRUBY_ARGS =	$(SCRIPT_ARGS) \
 --data-mode=$(INSTALL_DATA_MODE) \
 --prog-mode=$(INSTALL_PROG_MODE) \
@@ -396,7 +396,7 @@ btest-ruby: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
 @$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib" -q $(OPTS)
 test-sample: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
-	@$(RUNRUBY) $(srcdir)/rubytest.rb
 test-knownbug: miniruby$(EXEEXT) $(PROGRAM) $(RBCONFIG) PHONY
 $(MINIRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM)" $(OPTS) $(srcdir)/KNOWNBUGS.rb
@@ -410,8 +410,8 @@ extconf: $(PREP)
 $(MAKEDIRS) "$(EXTCONFDIR)"
 $(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
-$(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP)
-	@$(MINIRUBY) $(srcdir)/mkconfig.rb -timestamp=$@ \
 -install_name=$(RUBY_INSTALL_NAME) \
 -so_name=$(RUBY_SO_NAME) rbconfig.rb
@@ -1911,7 +1911,7 @@ else
 MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
 MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb'
 PREP='miniruby$(EXEEXT)'
- RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)'
 fi
 AC_SUBST(MINIRUBY)
 AC_SUBST(PREP)
@@ -4,7 +4,7 @@ load "./rbconfig.rb"
 include RbConfig
 $".unshift File.expand_path("./rbconfig.rb")
-srcdir = File.dirname(__FILE__)
 unless defined?(CROSS_COMPILING) and CROSS_COMPILING
 $:.replace([File.expand_path("lib", srcdir), Dir.pwd])
 end
@@ -4,7 +4,7 @@
 $install_name ||= nil
 $so_name ||= nil
-srcdir = File.dirname(__FILE__)
 $:.replace [srcdir+"/lib"] unless defined?(CROSS_COMPILING)
 $:.unshift(".")
@@ -15,7 +15,7 @@ end
 $stderr.reopen($stdout)
 error = ''
-srcdir = File.dirname(__FILE__)
 `#{ruby} #{srcdir}/sample/test.rb`.each_line do |line|
 if line =~ /^end of test/
 print "\ntest succeeded\n"
@@ -33,7 +33,7 @@ while arg = ARGV[0]
 ARGV.shift
 end
-srcdir ||= File.dirname(__FILE__)
 archdir ||= '.'
 abs_archdir = File.expand_path(archdir)
@@ -232,7 +232,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)" $(RUNRUBYOPT) --
 !ifndef RUBY
 RUBY = ruby
 !endif