summaryrefslogtreecommitdiff
path: root/enc
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2020-04-04 18:57:05 (GMT)
committerNobuyoshi Nakada <nobu@ruby-lang.org>2020-04-05 00:26:57 (GMT)
commit21d0b40de2897ac2e98104cb3d33cd374a4402ee (patch)
tree66172b7fc8c7fa391cc2bba8ab77fb9e69256577 /enc
parent5e2463b242d1c7fc9f0bad11daa2a8a288dc28e3 (diff)
Added tooldir variable
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3003
Diffstat (limited to 'enc')
-rw-r--r--enc/Makefile.in1
-rw-r--r--enc/depend4
2 files changed, 3 insertions, 2 deletions
diff --git a/enc/Makefile.in b/enc/Makefile.in
index 8385236..9203874 100644
--- a/enc/Makefile.in
+++ b/enc/Makefile.in
@@ -11,6 +11,7 @@ exec_prefix = @exec_prefix@
libdir = @libdir@
top_srcdir = $(encsrcdir:/enc=)
srcdir = $(top_srcdir)
+tooldir = $(top_srcdir)/tool
arch = @arch@
EXTOUT = @EXTOUT@
hdrdir = $(srcdir)/include
diff --git a/enc/depend b/enc/depend
index 7b1c7f8..e5b5224 100644
--- a/enc/depend
+++ b/enc/depend
@@ -97,7 +97,7 @@ $(ENCSOS) $(TRANSSOS): $(ENC_TRANS_SO_D)
<%=transvpath_prefix%>.trans<%=transvpath_prefix%>.c:
$(ECHO) generating table from $@
- $(Q)$(MINIRUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo "$@" "$<"
+ $(Q)$(MINIRUBY) "$(tooldir)/transcode-tblgen.rb" -vo "$@" "$<"
% unless ENCS.empty? or TRANS.empty?
@@ -113,7 +113,7 @@ enc/<%=e%>.$(OBJEXT): <%=deps.map {|n| rule_subst % n}.join(' ')%>
% if src.empty?
% src = trans.scan(/^\s*transcode_tblgen_\w+\s+[\'\"]([^\'\"]*)/).flatten.map{|c|c.downcase+"-tbl.rb"}
% end
-<%=transvpath % "#{e}.c"%>: <%= src.map {|s| transvpath % "#{s}"}.join(" ")%> $(srcdir)/tool/transcode-tblgen.rb
+<%=transvpath % "#{e}.c"%>: <%= src.map {|s| transvpath % "#{s}"}.join(" ")%> $(tooldir)/transcode-tblgen.rb
% end
% end