summaryrefslogtreecommitdiffstats
path: root/common.mk
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-22 11:48:42 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-22 11:48:42 +0000
commitd727cbbffc83accb258c8d5ae7668ada68c872cc (patch)
tree659055a68358882dbf54523a88525ce12d3caf8c /common.mk
parent2be56d8bb832ce5963c3cd735d159e41d944e1c6 (diff)
downloadruby-d727cbbffc83accb258c8d5ae7668ada68c872cc.tar.gz
ruby-d727cbbffc83accb258c8d5ae7668ada68c872cc.tar.xz
ruby-d727cbbffc83accb258c8d5ae7668ada68c872cc.zip
* instruby.rb: moved into tool/.
* mkconfig.rb: ditto. * rubytest.rb: ditto. * runruby.rb: ditto. * common.mk: follows the moves. * configure.in: ditto. * win32/Makefile.sub: ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/common.mk b/common.mk
index d4e3ebbd3..37f8d6884 100644
--- a/common.mk
+++ b/common.mk
@@ -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 = $(MINIRUBY) $(srcdir)/tool/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
+ @$(RUNRUBY) $(srcdir)/tool/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=$@ \
+$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(PREP)
+ @$(MINIRUBY) $(srcdir)/tool/mkconfig.rb -timestamp=$@ \
-install_name=$(RUBY_INSTALL_NAME) \
-so_name=$(RUBY_SO_NAME) rbconfig.rb