2 files changed, 6 insertions, 1 deletions
diff --git a/common.mk b/common.mk
index b3f518c328..eda225a30a 100644
--- a/common.mk
+++ b/common.mk
@@ -996,7 +996,10 @@ gdb-ruby: $(PROGRAM) run.gdb PHONY
 	$(Q) $(RUNRUBY_COMMAND) $(RUNRUBY_DEBUGGER) -- $(TESTRUN_SCRIPT)
 
 dist:
-	$(BASERUBY) $(srcdir)/tool/make-snapshot -srcdir=$(srcdir) tmp $(RELNAME)
+	$(BASERUBY) $(srcdir)/tool/make-snapshot \
+	-srcdir=$(srcdir) \
+	-unicode-version=$(UNICODE_VERSION) \
+	tmp $(RELNAME)
 
 up:: update-remote
 
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 73278a34bc..f1663a3e22 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -17,6 +17,7 @@ $patch_file ||= nil
 $packages ||= nil
 $digests ||= nil
 $tooldir = File.expand_path("..", __FILE__)
+$unicode_version = nil if ($unicode_version ||= nil) == ""
 
 def usage
   <<USAGE
@@ -309,6 +310,7 @@ def package(vcs, rev, destdir, tmp = nil)
         "PWD"=>Dir.pwd,
         "CONFIGURE"=>"configure",
       }
+      vars["UNICODE_VERSION"] = $unicode_version if $unicode_version
       args = vars.dup
       mk.gsub!(/@([A-Za-z_]\w*)@/) {args.delete($1); vars[$1] || ENV[$1]}
       mk << commonmk.gsub(/\{\$([^(){}]*)[^{}]*\}/, "")