88 files changed, 10 insertions, 6 deletions
diff --git a/Build/source/texk/cjkutils/ChangeLog b/Build/source/texk/cjkutils/ChangeLog
index e5a51c3641b..1eb36209ba6 100644
--- a/Build/source/texk/cjkutils/ChangeLog
+++ b/Build/source/texk/cjkutils/ChangeLog
@@ -1,3 +1,7 @@
+2016-02-23  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* Makefile.am, configure.ac: New convention.
+
 2015-07-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Better dependencies for 'make check'.
diff --git a/Build/source/texk/cjkutils/Makefile.am b/Build/source/texk/cjkutils/Makefile.am
index 69fe41c973a..b3f2b9a8a6a 100644
--- a/Build/source/texk/cjkutils/Makefile.am
+++ b/Build/source/texk/cjkutils/Makefile.am
@@ -6,7 +6,7 @@
 ## We want to re-distribute the whole original cjk/utils source tree.
 EXTRA_DIST = $(CJKUTILS_TREE)
 ## Patches applied to the original source tree
-EXTRA_DIST += $(CJKUTILS_TREE)-PATCHES
+EXTRA_DIST += cjkutils-PATCHES
 
 # Files not to be distributed
 include $(srcdir)/../../am/dist_hook.am
diff --git a/Build/source/texk/cjkutils/Makefile.in b/Build/source/texk/cjkutils/Makefile.in
index ff2126b68c2..7c50fb0f88c 100644
--- a/Build/source/texk/cjkutils/Makefile.in
+++ b/Build/source/texk/cjkutils/Makefile.in
@@ -590,7 +590,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = $(CJKUTILS_TREE) $(CJKUTILS_TREE)-PATCHES $(CWEB_TEX) \
+EXTRA_DIST = $(CJKUTILS_TREE) cjkutils-PATCHES $(CWEB_TEX) \
 	$(CWEB_DVI) $(TESTS) tests/bg5conv.tex tests/bg5conv.cjk \
 	tests/cefconv.tex tests/cefconv.cjk tests/cef5conv.tex \
 	tests/cef5conv.cjk tests/cefsconv.tex tests/cefsconv.cjk \
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4-PATCHES/ChangeLog b/Build/source/texk/cjkutils/cjkutils-PATCHES/ChangeLog
index d05c74e94fd..d05c74e94fd 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4-PATCHES/ChangeLog
+++ b/Build/source/texk/cjkutils/cjkutils-PATCHES/ChangeLog
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4-PATCHES/TL-Changes b/Build/source/texk/cjkutils/cjkutils-PATCHES/TL-Changes
index e3e36c9fef6..e3e36c9fef6 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4-PATCHES/TL-Changes
+++ b/Build/source/texk/cjkutils/cjkutils-PATCHES/TL-Changes
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4-PATCHES/patch-04-mingw64 b/Build/source/texk/cjkutils/cjkutils-PATCHES/patch-04-mingw64
index d429f5cb873..d429f5cb873 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4-PATCHES/patch-04-mingw64
+++ b/Build/source/texk/cjkutils/cjkutils-PATCHES/patch-04-mingw64
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5conv.1 b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5conv.1
index a9e83901cf0..a9e83901cf0 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5conv.1
+++ b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5conv.1
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5conv.c b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5conv.c
index b745e6a97f5..b745e6a97f5 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5conv.c
+++ b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5conv.c
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5conv.w b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5conv.w
index 13165032d66..13165032d66 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5conv.w
+++ b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5conv.w
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5latex b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5latex
index 2540f9524d8..2540f9524d8 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5latex
+++ b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5latex
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5latex.bat b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5latex.bat
index 91e7dfd8575..91e7dfd8575 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5latex.bat
+++ b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5latex.bat
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5latex.cmd b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5latex.cmd
index facf871970c..facf871970c 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5latex.cmd
+++ b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5latex.cmd
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5pdflatex b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5pdflatex
index 9adacad3a68..9adacad3a68 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5pdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5pdflatex
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5conv.1 b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5conv.1
index d04c5271029..d04c5271029 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5conv.1
+++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5conv.1
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5conv.c b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5conv.c
index 46228a1f5de..46228a1f5de 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5conv.c
+++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5conv.c
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5conv.w b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5conv.w
index 575ba253aea..575ba253aea 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5conv.w
+++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5conv.w
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5latex b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5latex
index 1b51a711d1b..1b51a711d1b 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5latex
+++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5latex
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5ltx.bat b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5ltx.bat
index 187485301f9..187485301f9 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5ltx.bat
+++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5ltx.bat
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5ltx.cmd b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5ltx.cmd
index f089e831c62..f089e831c62 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5ltx.cmd
+++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5ltx.cmd
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5pdflatex b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5pdflatex
index 1ae7b5953ef..1ae7b5953ef 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5pdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5pdflatex
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefconv.1 b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefconv.1
index 7be7fae6ba8..7be7fae6ba8 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefconv.1
+++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefconv.1
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefconv.c b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefconv.c
index 967672e7938..967672e7938 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefconv.c
+++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefconv.c
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefconv.w b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefconv.w
index 142a5d862be..142a5d862be 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefconv.w
+++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefconv.w
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/ceflatex b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/ceflatex
index 79bcd8abe36..79bcd8abe36 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/ceflatex
+++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/ceflatex
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/ceflatex.bat b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/ceflatex.bat
index ba5925a6df3..ba5925a6df3 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/ceflatex.bat
+++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/ceflatex.bat
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/ceflatex.cmd b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/ceflatex.cmd
index dcc3183431e..dcc3183431e 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/ceflatex.cmd
+++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/ceflatex.cmd
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefpdflatex b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefpdflatex
index c1b776cffdf..c1b776cffdf 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefpdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefpdflatex
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefsconv.1 b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsconv.1
index 4c38133298e..4c38133298e 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefsconv.1
+++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsconv.1
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefsconv.c b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsconv.c
index bd4a701ffc5..bd4a701ffc5 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefsconv.c
+++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsconv.c
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefsconv.w b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsconv.w
index 7e033f34ea4..7e033f34ea4 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefsconv.w
+++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsconv.w
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefslatex b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefslatex
index 3d3daa175b1..3d3daa175b1 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefslatex
+++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefslatex
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefsltx.bat b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsltx.bat
index 662ef9e3af4..662ef9e3af4 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefsltx.bat
+++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsltx.bat
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefsltx.cmd b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsltx.cmd
index 7150e8aad1b..7150e8aad1b 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefsltx.cmd
+++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsltx.cmd
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefspdflatex b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefspdflatex
index ed981d4dfb2..ed981d4dfb2 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefspdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefspdflatex
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/ChangeLog b/Build/source/texk/cjkutils/cjkutils-src/ChangeLog
index f943ead7ea7..f943ead7ea7 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/ChangeLog
+++ b/Build/source/texk/cjkutils/cjkutils-src/ChangeLog
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/README b/Build/source/texk/cjkutils/cjkutils-src/README
index cf33f17eb75..cf33f17eb75 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/README
+++ b/Build/source/texk/cjkutils/cjkutils-src/README
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjisconv.1 b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisconv.1
index c385eb616d4..c385eb616d4 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjisconv.1
+++ b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisconv.1
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjisconv.c b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisconv.c
index af121e555d3..af121e555d3 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjisconv.c
+++ b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisconv.c
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjisconv.w b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisconv.w
index c1044cf36d9..c1044cf36d9 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjisconv.w
+++ b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisconv.w
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjislatex b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjislatex
index b1086cba768..b1086cba768 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjislatex
+++ b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjislatex
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjisltx.bat b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisltx.bat
index 5702c113bdf..5702c113bdf 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjisltx.bat
+++ b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisltx.bat
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjisltx.cmd b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisltx.cmd
index 2ff4e03e54d..2ff4e03e54d 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjisltx.cmd
+++ b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisltx.cmd
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjispdflatex b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjispdflatex
index 651570da7f2..651570da7f2 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjispdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjispdflatex
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/cjklatex/cjklatex.c b/Build/source/texk/cjkutils/cjkutils-src/cjklatex/cjklatex.c
index 678c1dd3a89..678c1dd3a89 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/cjklatex/cjklatex.c
+++ b/Build/source/texk/cjkutils/cjkutils-src/cjklatex/cjklatex.c
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/bg5+latex b/Build/source/texk/cjkutils/cjkutils-src/extconv/bg5+latex
index 82e706a44f7..82e706a44f7 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/bg5+latex
+++ b/Build/source/texk/cjkutils/cjkutils-src/extconv/bg5+latex
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/bg5+pdflatex b/Build/source/texk/cjkutils/cjkutils-src/extconv/bg5+pdflatex
index 16377e9dc17..16377e9dc17 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/bg5+pdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-src/extconv/bg5+pdflatex
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/bg5pltx.bat b/Build/source/texk/cjkutils/cjkutils-src/extconv/bg5pltx.bat
index ccc6c76acd5..ccc6c76acd5 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/bg5pltx.bat
+++ b/Build/source/texk/cjkutils/cjkutils-src/extconv/bg5pltx.bat
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/bg5pltx.cmd b/Build/source/texk/cjkutils/cjkutils-src/extconv/bg5pltx.cmd
index 69a94952089..69a94952089 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/bg5pltx.cmd
+++ b/Build/source/texk/cjkutils/cjkutils-src/extconv/bg5pltx.cmd
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/extconv.1 b/Build/source/texk/cjkutils/cjkutils-src/extconv/extconv.1
index 1ef4b011d84..1ef4b011d84 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/extconv.1
+++ b/Build/source/texk/cjkutils/cjkutils-src/extconv/extconv.1
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/extconv.c b/Build/source/texk/cjkutils/cjkutils-src/extconv/extconv.c
index fdba62551c4..fdba62551c4 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/extconv.c
+++ b/Build/source/texk/cjkutils/cjkutils-src/extconv/extconv.c
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/extconv.w b/Build/source/texk/cjkutils/cjkutils-src/extconv/extconv.w
index 019976889b9..019976889b9 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/extconv.w
+++ b/Build/source/texk/cjkutils/cjkutils-src/extconv/extconv.w
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/gbklatex b/Build/source/texk/cjkutils/cjkutils-src/extconv/gbklatex
index 82e706a44f7..82e706a44f7 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/gbklatex
+++ b/Build/source/texk/cjkutils/cjkutils-src/extconv/gbklatex
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/gbklatex.bat b/Build/source/texk/cjkutils/cjkutils-src/extconv/gbklatex.bat
index ccc6c76acd5..ccc6c76acd5 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/gbklatex.bat
+++ b/Build/source/texk/cjkutils/cjkutils-src/extconv/gbklatex.bat
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/gbklatex.cmd b/Build/source/texk/cjkutils/cjkutils-src/extconv/gbklatex.cmd
index 9bd1237934a..9bd1237934a 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/gbklatex.cmd
+++ b/Build/source/texk/cjkutils/cjkutils-src/extconv/gbklatex.cmd
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/gbkpdflatex b/Build/source/texk/cjkutils/cjkutils-src/extconv/gbkpdflatex
index 16377e9dc17..16377e9dc17 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/gbkpdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-src/extconv/gbkpdflatex
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/Makefile.gnu b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/Makefile.gnu
index 1248c4f508a..1248c4f508a 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/Makefile.gnu
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/Makefile.gnu
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/Makefile.in b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/Makefile.in
index 937d5d6f818..937d5d6f818 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/Makefile.in
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/Makefile.in
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/README b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/README
index a7de0ec1402..a7de0ec1402 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/README
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/README
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/README b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/README
index 689d59e7397..689d59e7397 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/README
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/README
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/b5ka12.cfg b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/b5ka12.cfg
index f5c142f0235..f5c142f0235 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/b5ka12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/b5ka12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/b5kr12.cfg b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/b5kr12.cfg
index 9d9da2c1a2f..9d9da2c1a2f 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/b5kr12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/b5kr12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/b5so12.cfg b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/b5so12.cfg
index dc0bcd9fbf0..dc0bcd9fbf0 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/b5so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/b5so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c1so12.cfg b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/c1so12.cfg
index de5b32b3efc..de5b32b3efc 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c1so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/c1so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c2so12.cfg b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/c2so12.cfg
index 969af8fae14..969af8fae14 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c2so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/c2so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c3so12.cfg b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/c3so12.cfg
index 0e65768ee5e..0e65768ee5e 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c3so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/c3so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c4so12.cfg b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/c4so12.cfg
index 8ea3a8b270c..8ea3a8b270c 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c4so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/c4so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c5so12.cfg b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/c5so12.cfg
index 1b81c90a0d3..1b81c90a0d3 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c5so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/c5so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c6so12.cfg b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/c6so12.cfg
index 5b9c912ce53..5b9c912ce53 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c6so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/c6so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c7so12.cfg b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/c7so12.cfg
index 051b2601426..051b2601426 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c7so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/c7so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/csso12.cfg b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/csso12.cfg
index 9ad91b0c574..9ad91b0c574 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/csso12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/csso12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/gsfs14.cfg b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/gsfs14.cfg
index 4b397aca464..4b397aca464 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/gsfs14.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/gsfs14.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/j2so12.cfg b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/j2so12.cfg
index 7e0d70b5c0f..7e0d70b5c0f 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/j2so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/j2so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/jsso12.cfg b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/jsso12.cfg
index 9bdfc7b1e8a..9bdfc7b1e8a 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/jsso12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/jsso12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/ksso17.cfg b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/ksso17.cfg
index c82f7e7eee4..c82f7e7eee4 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/ksso17.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/cfg/ksso17.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/configure.ac b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/configure.ac
index 4c28719516c..4c28719516c 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/configure.ac
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/configure.ac
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/dvidrv.btm b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/dvidrv.btm
index 4ec03d0bf20..4ec03d0bf20 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/dvidrv.btm
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/dvidrv.btm
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/emdir.c b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/emdir.c
index 4e759c83eb2..4e759c83eb2 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/emdir.c
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/emdir.c
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/emdir.h b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/emdir.h
index 0606d476ab1..0606d476ab1 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/emdir.h
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/emdir.h
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/emtexdir.c b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/emtexdir.c
index 9a35570adb3..9a35570adb3 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/emtexdir.c
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/emtexdir.c
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/emtexdir.h b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/emtexdir.h
index a9a986db05b..a9a986db05b 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/emtexdir.h
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/emtexdir.h
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf.c b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf.c
index dedb9650b21..dedb9650b21 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf.c
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf.c
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf.h b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf.h
index 34f5940a71b..34f5940a71b 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf.h
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf.h
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf2gf.1 b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.1
index 144e7e68930..144e7e68930 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf2gf.1
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.1
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf2gf.c b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.c
index 1e250496a64..1e250496a64 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf2gf.c
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.c
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf2gf.def b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.def
index 583767e897d..583767e897d 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf2gf.def
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.def
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf2gf.w b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.w
index 2a6c5b552d1..2a6c5b552d1 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf2gf.w
+++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.w
diff --git a/Build/source/texk/cjkutils/configure b/Build/source/texk/cjkutils/configure
index 76e708f40b6..738989d54cd 100755
--- a/Build/source/texk/cjkutils/configure
+++ b/Build/source/texk/cjkutils/configure
@@ -595,7 +595,7 @@ PACKAGE_STRING='CJK utils (TeX Live) 4.8.4'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="cjkutils-4.8.4/hbf2gf/hbf.h"
+ac_unique_file="cjkutils-src/hbf2gf/hbf.h"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -15214,7 +15214,7 @@ fi
 
 
 
-CJKUTILS_TREE=cjkutils-4.8.4
+CJKUTILS_TREE=cjkutils-src
 
 
 ac_config_files="$ac_config_files Makefile"
diff --git a/Build/source/texk/cjkutils/configure.ac b/Build/source/texk/cjkutils/configure.ac
index bcfa51f16cb..0d345603925 100644
--- a/Build/source/texk/cjkutils/configure.ac
+++ b/Build/source/texk/cjkutils/configure.ac
@@ -9,7 +9,7 @@ dnl
 m4_include([version.ac])[] dnl define cjk_version
 AC_INIT([CJK utils (TeX Live)], cjk_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
-AC_CONFIG_SRCDIR([cjkutils-]cjk_version[/hbf2gf/hbf.h])
+AC_CONFIG_SRCDIR([cjkutils-src/hbf2gf/hbf.h])
 AC_CONFIG_AUX_DIR([../../build-aux])
 AC_CONFIG_MACRO_DIR([../../m4])
 
@@ -63,7 +63,7 @@ AM_CONDITIONAL([do_cweb], [test "x$do_cweb" = xyes])
 
 KPSE_COND_WIN32
 
-AC_SUBST([CJKUTILS_TREE], [cjkutils-]cjk_version)
+AC_SUBST([CJKUTILS_TREE], [cjkutils-src])
 
 AC_CONFIG_FILES([Makefile])