* common.mk: using new option in recipe for enc/unicode/casefold.h

* enc/unicode/case-folding.rb: Correctly specify argument to new option.
(with Kimihito Matsui)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53762 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index efe1380bce..5bb7d30863 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Feb  7 11:16:00 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* common.mk: using new option in recipe for enc/unicode/casefold.h
+
+	* enc/unicode/case-folding.rb: Correctly specify argument to new option.
+	(with Kimihito Matsui)
+
 Sun Feb  7 10:43:27 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
 	(this commit message applies to the previous commit)
diff --git a/common.mk b/common.mk
index c622c14ed7..afe8c51cb7 100644
--- a/common.mk
+++ b/common.mk
@@ -1051,7 +1051,7 @@ $(srcdir)/enc/unicode/casefold.h: $(srcdir)/enc/unicode/case-folding.rb \
 		$(UNICODE_SRC_DATA_DIR)/CaseFolding.txt
 	$(Q) $(BASERUBY) $(srcdir)/enc/unicode/case-folding.rb \
 		--output-file=$(srcdir)/enc/unicode/casefold.h \
-		$(UNICODE_SRC_DATA_DIR)/CaseFolding.txt
+		--mapping-data-directory=$(UNICODE_SRC_DATA_DIR)
 
 download-extlibs:
 	$(Q) $(BASERUBY) -C $(srcdir) -w tool/extlibs.rb --download ext
diff --git a/enc/unicode/case-folding.rb b/enc/unicode/case-folding.rb
index a4adfc645c..6f801cca84 100755
--- a/enc/unicode/case-folding.rb
+++ b/enc/unicode/case-folding.rb
@@ -186,7 +186,7 @@ if $0 == __FILE__
     opt.on("--output-file=FILE", "-o", "output to the FILE instead of STDOUT") {|output|
       dest = (output unless output == '-')
     }
-    opt.on('--mapping-data-directory', '-m', 'data directory of mapping files') { |directory|
+    opt.on('--mapping-data-directory=DIRECTORY', '-m', 'data DIRECTORY of mapping files') { |directory|
       mapping_directory = directory
     }
     opt.parse!