diff --git a/common.mk b/common.mk index 5dbd916c6d..6d252c6978 100644 --- a/common.mk +++ b/common.mk @@ -1098,9 +1098,10 @@ update-unicode: PHONY enc/unicode/data/UnicodeData.txt: update-unicode lib/unicode_normalize/tables.rb: tool/unicode_norm_gen.rb \ -enc/unicode/data/UnicodeData.txt \ -enc/unicode/data/CompositionExclusions.txt - $(BASERUBY) -C "$(srcdir)/tool" unicode_norm_gen.rb + enc/unicode/data/UnicodeData.txt \ + enc/unicode/data/CompositionExclusions.txt + $(BASERUBY) -s -C "$(srcdir)" tool/unicode_norm_gen.rb \ + -input=enc/unicode/data -ouput=lib/unicode_normalize info: info-program info-libruby_a info-libruby_so info-arch info-program: PHONY diff --git a/tool/unicode_norm_gen.rb b/tool/unicode_norm_gen.rb index b728abbf49..5f2545075b 100644 --- a/tool/unicode_norm_gen.rb +++ b/tool/unicode_norm_gen.rb @@ -6,8 +6,8 @@ # String#unicode_normalize,... # Constants for input and ouput directory -InputDataDir = '../enc/unicode/data' -OuputDataDir = '../lib/unicode_normalize' +InputDataDir = $input || 'enc/unicode/data' +OuputDataDir = $ouput || 'lib/unicode_normalize' # convenience methods class Integer