Added tooldir variable

1 files changed, 61 insertions, 59 deletions

diff --git a/template/Makefile.in b/template/Makefile.in
index a3b067b824..33ea093838 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -16,6 +16,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 srcdir = @srcdir@
 top_srcdir = $(srcdir)
 hdrdir = $(srcdir)/include
+tooldir = $(srcdir)/tool
+
 PLATFORM_DIR = @PLATFORM_DIR@
 
 CC_WRAPPER = @XCC_WRAPPER@
@@ -213,7 +215,7 @@ ARFLAGS       = @ARFLAGS@$(empty)
 RANLIB        = @RANLIB@
 AS            = @AS@
 ASFLAGS       = @ASFLAGS@ $(INCFLAGS)
-IFCHANGE      = $(srcdir)/tool/ifchange
+IFCHANGE      = $(tooldir)/ifchange
 OBJDUMP       = @OBJDUMP@
 OBJCOPY       = @OBJCOPY@
 HAVE_GIT      = @HAVE_GIT@
@@ -392,7 +394,7 @@ lex.c: defs/keywords
 	else \
 	  [ $(Q) ] && echo generating $@ || set -x; \
 	  gperf -C -P -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? \
-	  | sed -f $(srcdir)/tool/gperf.sed \
+	  | sed -f $(tooldir)/gperf.sed \
 	  > $@.tmp && \
 	  $(MV) $@.tmp $@ && \
 	  $(CP) $? $(srcdir)/defs/lex.c.src && \
@@ -410,7 +412,7 @@ $(srcdir)/enc/jis/props.h: enc/jis/props.kwd
 	else \
 	  set -x; \
 	  gperf $(JIS_PROPS_OPTIONS) $? | \
-	  sed -f $(srcdir)/tool/gperf.sed > $@ && \
+	  sed -f $(tooldir)/gperf.sed > $@ && \
 	  $(CP) $? $(?:.kwd=.src) && \
 	  $(CP) $@ $(?:.kwd=.h.blt); \
 	fi
@@ -546,28 +548,28 @@ update-download:: update-config_files
 after-update:: prereq
 
 gcov:
-	$(Q) $(BASERUBY) $(srcdir)/tool/run-gcov.rb
+	$(Q) $(BASERUBY) $(tooldir)/run-gcov.rb
 
 lcov:
-	$(Q) $(BASERUBY) $(srcdir)/tool/run-lcov.rb
+	$(Q) $(BASERUBY) $(tooldir)/run-lcov.rb
 
 update-benchmark-driver:
-	$(Q) $(srcdir)/tool/git-refresh -C $(srcdir)/benchmark $(Q1:0=-q) \
+	$(Q) $(tooldir)/git-refresh -C $(srcdir)/benchmark $(Q1:0=-q) \
 		--branch $(BENCHMARK_DRIVER_GIT_REF) \
 		$(BENCHMARK_DRIVER_GIT_URL) benchmark-driver $(GIT_OPTS)
 
 update-doclie:
-	$(Q) $(srcdir)/tool/git-refresh -C $(srcdir)/coverage $(Q1:0=-q) \
+	$(Q) $(tooldir)/git-refresh -C $(srcdir)/coverage $(Q1:0=-q) \
 		--branch $(DOCLIE_GIT_REF) \
 		$(DOCLIE_GIT_URL) doclie $(GIT_OPTS)
 
 update-simplecov-html:
-	$(Q) $(srcdir)/tool/git-refresh -C $(srcdir)/coverage $(Q1:0=-q) \
+	$(Q) $(tooldir)/git-refresh -C $(srcdir)/coverage $(Q1:0=-q) \
 		--branch $(SIMPLECOV_HTML_GIT_REF) \
 		$(SIMPLECOV_HTML_GIT_URL) simplecov-html $(GIT_OPTS)
 
 update-simplecov:
-	$(Q) $(srcdir)/tool/git-refresh -C $(srcdir)/coverage $(Q1:0=-q) \
+	$(Q) $(tooldir)/git-refresh -C $(srcdir)/coverage $(Q1:0=-q) \
 		--branch $(SIMPLECOV_GIT_REF)  \
 		$(SIMPLECOV_GIT_URL) simplecov $(GIT_OPTS)
 
@@ -582,54 +584,54 @@ INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
 
 $(INSNS): $(srcdir)/insns.def vm_opts.h \
 	  $(srcdir)/defs/opt_operand.def $(srcdir)/defs/opt_insn_unif.def \
-	  $(srcdir)/tool/insns2vm.rb \
-	  $(srcdir)/tool/ruby_vm/controllers/application_controller.rb \
-	  $(srcdir)/tool/ruby_vm/helpers/c_escape.rb \
-	  $(srcdir)/tool/ruby_vm/helpers/dumper.rb \
-	  $(srcdir)/tool/ruby_vm/helpers/scanner.rb \
-	  $(srcdir)/tool/ruby_vm/loaders/insns_def.rb \
-	  $(srcdir)/tool/ruby_vm/loaders/opt_insn_unif_def.rb \
-	  $(srcdir)/tool/ruby_vm/loaders/opt_operand_def.rb \
-	  $(srcdir)/tool/ruby_vm/loaders/vm_opts_h.rb \
-	  $(srcdir)/tool/ruby_vm/models/attribute.rb \
-	  $(srcdir)/tool/ruby_vm/models/bare_instructions.rb \
-	  $(srcdir)/tool/ruby_vm/models/c_expr.rb \
-	  $(srcdir)/tool/ruby_vm/models/instructions.rb \
-	  $(srcdir)/tool/ruby_vm/models/instructions_unifications.rb \
-	  $(srcdir)/tool/ruby_vm/models/operands_unifications.rb \
-	  $(srcdir)/tool/ruby_vm/models/trace_instructions.rb \
-	  $(srcdir)/tool/ruby_vm/models/typemap.rb \
-	  $(srcdir)/tool/ruby_vm/scripts/converter.rb \
-	  $(srcdir)/tool/ruby_vm/scripts/insns2vm.rb \
-	  $(srcdir)/tool/ruby_vm/views/_attributes.erb \
-	  $(srcdir)/tool/ruby_vm/views/_c_expr.erb \
-	  $(srcdir)/tool/ruby_vm/views/_comptime_insn_stack_increase.erb \
-	  $(srcdir)/tool/ruby_vm/views/_copyright.erb \
-	  $(srcdir)/tool/ruby_vm/views/_insn_entry.erb \
-	  $(srcdir)/tool/ruby_vm/views/_insn_len_info.erb \
-	  $(srcdir)/tool/ruby_vm/views/_insn_name_info.erb \
-	  $(srcdir)/tool/ruby_vm/views/_insn_operand_info.erb \
-	  $(srcdir)/tool/ruby_vm/views/_insn_sp_pc_dependency.erb \
-	  $(srcdir)/tool/ruby_vm/views/_insn_type_chars.erb \
-	  $(srcdir)/tool/ruby_vm/views/_leaf_helpers.erb \
-	  $(srcdir)/tool/ruby_vm/views/_mjit_compile_insn.erb \
-	  $(srcdir)/tool/ruby_vm/views/_mjit_compile_insn_body.erb \
-	  $(srcdir)/tool/ruby_vm/views/_mjit_compile_ivar.erb \
-	  $(srcdir)/tool/ruby_vm/views/_mjit_compile_pc_and_sp.erb \
-	  $(srcdir)/tool/ruby_vm/views/_mjit_compile_send.erb \
-	  $(srcdir)/tool/ruby_vm/views/_notice.erb \
-	  $(srcdir)/tool/ruby_vm/views/_sp_inc_helpers.erb \
-	  $(srcdir)/tool/ruby_vm/views/_trace_instruction.erb \
-	  $(srcdir)/tool/ruby_vm/views/insns.inc.erb \
-	  $(srcdir)/tool/ruby_vm/views/insns_info.inc.erb \
-	  $(srcdir)/tool/ruby_vm/views/mjit_compile.inc.erb \
-	  $(srcdir)/tool/ruby_vm/views/opt_sc.inc.erb \
-	  $(srcdir)/tool/ruby_vm/views/optinsn.inc.erb \
-	  $(srcdir)/tool/ruby_vm/views/optunifs.inc.erb \
-	  $(srcdir)/tool/ruby_vm/views/vm.inc.erb \
-	  $(srcdir)/tool/ruby_vm/views/vmtc.inc.erb
+	  $(tooldir)/insns2vm.rb \
+	  $(tooldir)/ruby_vm/controllers/application_controller.rb \
+	  $(tooldir)/ruby_vm/helpers/c_escape.rb \
+	  $(tooldir)/ruby_vm/helpers/dumper.rb \
+	  $(tooldir)/ruby_vm/helpers/scanner.rb \
+	  $(tooldir)/ruby_vm/loaders/insns_def.rb \
+	  $(tooldir)/ruby_vm/loaders/opt_insn_unif_def.rb \
+	  $(tooldir)/ruby_vm/loaders/opt_operand_def.rb \
+	  $(tooldir)/ruby_vm/loaders/vm_opts_h.rb \
+	  $(tooldir)/ruby_vm/models/attribute.rb \
+	  $(tooldir)/ruby_vm/models/bare_instructions.rb \
+	  $(tooldir)/ruby_vm/models/c_expr.rb \
+	  $(tooldir)/ruby_vm/models/instructions.rb \
+	  $(tooldir)/ruby_vm/models/instructions_unifications.rb \
+	  $(tooldir)/ruby_vm/models/operands_unifications.rb \
+	  $(tooldir)/ruby_vm/models/trace_instructions.rb \
+	  $(tooldir)/ruby_vm/models/typemap.rb \
+	  $(tooldir)/ruby_vm/scripts/converter.rb \
+	  $(tooldir)/ruby_vm/scripts/insns2vm.rb \
+	  $(tooldir)/ruby_vm/views/_attributes.erb \
+	  $(tooldir)/ruby_vm/views/_c_expr.erb \
+	  $(tooldir)/ruby_vm/views/_comptime_insn_stack_increase.erb \
+	  $(tooldir)/ruby_vm/views/_copyright.erb \
+	  $(tooldir)/ruby_vm/views/_insn_entry.erb \
+	  $(tooldir)/ruby_vm/views/_insn_len_info.erb \
+	  $(tooldir)/ruby_vm/views/_insn_name_info.erb \
+	  $(tooldir)/ruby_vm/views/_insn_operand_info.erb \
+	  $(tooldir)/ruby_vm/views/_insn_sp_pc_dependency.erb \
+	  $(tooldir)/ruby_vm/views/_insn_type_chars.erb \
+	  $(tooldir)/ruby_vm/views/_leaf_helpers.erb \
+	  $(tooldir)/ruby_vm/views/_mjit_compile_insn.erb \
+	  $(tooldir)/ruby_vm/views/_mjit_compile_insn_body.erb \
+	  $(tooldir)/ruby_vm/views/_mjit_compile_ivar.erb \
+	  $(tooldir)/ruby_vm/views/_mjit_compile_pc_and_sp.erb \
+	  $(tooldir)/ruby_vm/views/_mjit_compile_send.erb \
+	  $(tooldir)/ruby_vm/views/_notice.erb \
+	  $(tooldir)/ruby_vm/views/_sp_inc_helpers.erb \
+	  $(tooldir)/ruby_vm/views/_trace_instruction.erb \
+	  $(tooldir)/ruby_vm/views/insns.inc.erb \
+	  $(tooldir)/ruby_vm/views/insns_info.inc.erb \
+	  $(tooldir)/ruby_vm/views/mjit_compile.inc.erb \
+	  $(tooldir)/ruby_vm/views/opt_sc.inc.erb \
+	  $(tooldir)/ruby_vm/views/optinsn.inc.erb \
+	  $(tooldir)/ruby_vm/views/optunifs.inc.erb \
+	  $(tooldir)/ruby_vm/views/vm.inc.erb \
+	  $(tooldir)/ruby_vm/views/vmtc.inc.erb
 	$(ECHO) generating $@
-	$(Q) $(BASERUBY) -Ku $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
+	$(Q) $(BASERUBY) -Ku $(tooldir)/insns2vm.rb $(INSNS2VMOPT) $@
 
 verconf.h: $(RBCONFIG)
 
@@ -645,7 +647,7 @@ un-runnable:
 mjit_config.h:
 	$(ECHO) making $@
 	@{ \
-	. $(srcdir)/tool/mjit_archflag.sh; \
+	. $(tooldir)/mjit_archflag.sh; \
 	parse_arch_flags "$(UNIVERSAL_ARCHNAMES)" $(ARCH_FLAG); \
 	test "$(Q)" = @ || set -x; \
 	echo '#ifndef RUBY_MJIT_CONFIG_H'; \
@@ -681,5 +683,5 @@ mjit_build_dir.$(SOEXT): $(MJIT_MIN_HEADER) $(srcdir)/ruby-runner.c ruby-runner.
 		$(OUTFLAG)$@ $(srcdir)/ruby-runner.c
 
 # yes-test-basic: leaked-globals
-leaked-globals: $(COMMONOBJS) prog $(srcdir)/tool/leaked-globals PHONY
-	$(Q) $(XRUBY) $(srcdir)/tool/leaked-globals NM=$(NM) SYMBOL_PREFIX=$(SYMBOL_PREFIX) $(srcdir)/configure.ac $(COMMONOBJS)
+leaked-globals: $(COMMONOBJS) prog $(tooldir)/leaked-globals PHONY
+	$(Q) $(XRUBY) $(tooldir)/leaked-globals NM=$(NM) SYMBOL_PREFIX=$(SYMBOL_PREFIX) $(srcdir)/configure.ac $(COMMONOBJS)