130 files changed, 10 insertions, 6 deletions

diff --git a/Build/source/libs/teckit/ChangeLog b/Build/source/libs/teckit/ChangeLog
index 376133dbff0..dbac2621516 100644
--- a/Build/source/libs/teckit/ChangeLog
+++ b/Build/source/libs/teckit/ChangeLog
@@ -1,3 +1,7 @@
+2016-02-22  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* Makefile.am, configure.ac: New convention.
+
 2015-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Better dependencies for 'make check'.
diff --git a/Build/source/libs/teckit/Makefile.am b/Build/source/libs/teckit/Makefile.am
index c152f7eb1ce..51fd9c152d7 100644
--- a/Build/source/libs/teckit/Makefile.am
+++ b/Build/source/libs/teckit/Makefile.am
@@ -9,7 +9,7 @@ EXTRA_DIST = $(TECKIT_TREE)
 
 ## Patches applied to the original source tree
 ##
-EXTRA_DIST += $(TECKIT_TREE)-PATCHES
+EXTRA_DIST += TECkit-PATCHES
 
 # Files not to be distributed
 include $(srcdir)/../../am/dist_hook.am
diff --git a/Build/source/libs/teckit/Makefile.in b/Build/source/libs/teckit/Makefile.in
index 376b3d51901..1d93d5da727 100644
--- a/Build/source/libs/teckit/Makefile.in
+++ b/Build/source/libs/teckit/Makefile.in
@@ -576,7 +576,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = $(TECKIT_TREE) $(TECKIT_TREE)-PATCHES teckit.test \
+EXTRA_DIST = $(TECKIT_TREE) TECkit-PATCHES teckit.test \
 	tex-text.map tex-text.tec
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
diff --git a/Build/source/libs/teckit/TECkit-2.5.4-PATCHES/ChangeLog b/Build/source/libs/teckit/TECkit-PATCHES/ChangeLog
index ffb9e3a9093..ffb9e3a9093 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4-PATCHES/ChangeLog
+++ b/Build/source/libs/teckit/TECkit-PATCHES/ChangeLog
diff --git a/Build/source/libs/teckit/TECkit-2.5.4-PATCHES/TL-Changes b/Build/source/libs/teckit/TECkit-PATCHES/TL-Changes
index 1d3e207a88f..1d3e207a88f 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4-PATCHES/TL-Changes
+++ b/Build/source/libs/teckit/TECkit-PATCHES/TL-Changes
diff --git a/Build/source/libs/teckit/TECkit-2.5.4-PATCHES/patch-02-warning b/Build/source/libs/teckit/TECkit-PATCHES/patch-02-warning
index 31e29ec497e..31e29ec497e 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4-PATCHES/patch-02-warning
+++ b/Build/source/libs/teckit/TECkit-PATCHES/patch-02-warning
diff --git a/Build/source/libs/teckit/TECkit-2.5.4-PATCHES/patch-03-warnings b/Build/source/libs/teckit/TECkit-PATCHES/patch-03-warnings
index f157ad022ec..f157ad022ec 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4-PATCHES/patch-03-warnings
+++ b/Build/source/libs/teckit/TECkit-PATCHES/patch-03-warnings
diff --git a/Build/source/libs/teckit/TECkit-2.5.4-PATCHES/patch-04-pragmas b/Build/source/libs/teckit/TECkit-PATCHES/patch-04-pragmas
index fc75d22e5d8..fc75d22e5d8 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4-PATCHES/patch-04-pragmas
+++ b/Build/source/libs/teckit/TECkit-PATCHES/patch-04-pragmas
diff --git a/Build/source/libs/teckit/TECkit-2.5.4-PATCHES/patch-05-static b/Build/source/libs/teckit/TECkit-PATCHES/patch-05-static
index 2e90b8f6218..2e90b8f6218 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4-PATCHES/patch-05-static
+++ b/Build/source/libs/teckit/TECkit-PATCHES/patch-05-static
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/AUTHORS b/Build/source/libs/teckit/TECkit-src/AUTHORS
index aaed820dee9..aaed820dee9 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/AUTHORS
+++ b/Build/source/libs/teckit/TECkit-src/AUTHORS
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/COPYING b/Build/source/libs/teckit/TECkit-src/COPYING
index 2e009b10e5a..2e009b10e5a 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/COPYING
+++ b/Build/source/libs/teckit/TECkit-src/COPYING
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/ChangeLog b/Build/source/libs/teckit/TECkit-src/ChangeLog
index f41b0c53af0..f41b0c53af0 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/ChangeLog
+++ b/Build/source/libs/teckit/TECkit-src/ChangeLog
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/INSTALL b/Build/source/libs/teckit/TECkit-src/INSTALL
index 9611572e9c0..9611572e9c0 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/INSTALL
+++ b/Build/source/libs/teckit/TECkit-src/INSTALL
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/Makefile.am b/Build/source/libs/teckit/TECkit-src/Makefile.am
index bc2fbb52725..bc2fbb52725 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/Makefile.am
+++ b/Build/source/libs/teckit/TECkit-src/Makefile.am
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/NEWS b/Build/source/libs/teckit/TECkit-src/NEWS
index a457bc840d2..a457bc840d2 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/NEWS
+++ b/Build/source/libs/teckit/TECkit-src/NEWS
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/README b/Build/source/libs/teckit/TECkit-src/README
index ccec2ee7ec6..ccec2ee7ec6 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/README
+++ b/Build/source/libs/teckit/TECkit-src/README
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/ConvertUTF.c b/Build/source/libs/teckit/TECkit-src/SFconv/ConvertUTF.c
index 9b3deebd674..9b3deebd674 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/ConvertUTF.c
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/ConvertUTF.c
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/ConvertUTF.h b/Build/source/libs/teckit/TECkit-src/SFconv/ConvertUTF.h
index e26491536fb..e26491536fb 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/ConvertUTF.h
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/ConvertUTF.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/Debug_Prefix.h b/Build/source/libs/teckit/TECkit-src/SFconv/Debug_Prefix.h
index 3b09f8e79c6..3b09f8e79c6 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/Debug_Prefix.h
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/Debug_Prefix.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/Final_Prefix.h b/Build/source/libs/teckit/TECkit-src/SFconv/Final_Prefix.h
index 7a2bf2f8d90..7a2bf2f8d90 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/Final_Prefix.h
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/Final_Prefix.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/SFconv.cpp b/Build/source/libs/teckit/TECkit-src/SFconv/SFconv.cpp
index 0604a08dd0d..0604a08dd0d 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/SFconv.cpp
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/SFconv.cpp
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/SFconv.prj b/Build/source/libs/teckit/TECkit-src/SFconv/SFconv.prj
index b713eef8ff1..b713eef8ff1 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/SFconv.prj
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/SFconv.prj
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/SFconv_ver.rc b/Build/source/libs/teckit/TECkit-src/SFconv/SFconv_ver.rc
index e43f530dc15..e43f530dc15 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/SFconv_ver.rc
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/SFconv_ver.rc
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/expat.html b/Build/source/libs/teckit/TECkit-src/SFconv/expat/expat.html
index 41a96805780..41a96805780 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/expat.html
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/expat.html
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlparse/MANIFEST b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlparse/MANIFEST
index 9678b2453fc..9678b2453fc 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlparse/MANIFEST
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlparse/MANIFEST
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlparse/Makefile.in b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlparse/Makefile.in
index e616b64bf40..e616b64bf40 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlparse/Makefile.in
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlparse/Makefile.in
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlparse/hashtable.c b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlparse/hashtable.c
index 780a0610414..780a0610414 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlparse/hashtable.c
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlparse/hashtable.c
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlparse/hashtable.h b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlparse/hashtable.h
index df8ab8a4c83..df8ab8a4c83 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlparse/hashtable.h
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlparse/hashtable.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlparse/makefile.win b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlparse/makefile.win
index 9c441e2e420..9c441e2e420 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlparse/makefile.win
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlparse/makefile.win
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlparse/xmlparse.c b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlparse/xmlparse.c
index c5e91ce5224..c5e91ce5224 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlparse/xmlparse.c
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlparse/xmlparse.c
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlparse/xmlparse.h b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlparse/xmlparse.h
index 284c31775e5..284c31775e5 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlparse/xmlparse.h
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlparse/xmlparse.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/Makefile.in b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/Makefile.in
index f5fbd9dec97..f5fbd9dec97 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/Makefile.in
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/Makefile.in
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/asciitab.h b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/asciitab.h
index 8a8a2dd388d..8a8a2dd388d 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/asciitab.h
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/asciitab.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/dllmain.c b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/dllmain.c
index deb7fafc81a..deb7fafc81a 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/dllmain.c
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/dllmain.c
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/iasciitab.h b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/iasciitab.h
index 333d6bb779d..333d6bb779d 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/iasciitab.h
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/iasciitab.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/latin1tab.h b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/latin1tab.h
index 48609aa8f9f..48609aa8f9f 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/latin1tab.h
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/latin1tab.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/makefile.win b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/makefile.win
index 6c7c4b9207c..6c7c4b9207c 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/makefile.win
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/makefile.win
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/nametab.h b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/nametab.h
index b05e62c77a6..b05e62c77a6 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/nametab.h
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/nametab.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/utf8tab.h b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/utf8tab.h
index a38fe624e88..a38fe624e88 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/utf8tab.h
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/utf8tab.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/xmldef.h b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/xmldef.h
index 3610b433e97..3610b433e97 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/xmldef.h
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/xmldef.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/xmlrole.c b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/xmlrole.c
index a8fdda78da2..a8fdda78da2 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/xmlrole.c
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/xmlrole.c
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/xmlrole.h b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/xmlrole.h
index 3e780e7f6e0..3e780e7f6e0 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/xmlrole.h
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/xmlrole.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/xmltok.c b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/xmltok.c
index b65c5564521..b65c5564521 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/xmltok.c
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/xmltok.c
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/xmltok.h b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/xmltok.h
index 6bb410879af..6bb410879af 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/xmltok.h
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/xmltok.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/xmltok_impl.c b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/xmltok_impl.c
index b3d358dd2d0..b3d358dd2d0 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/xmltok_impl.c
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/xmltok_impl.c
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/xmltok_impl.h b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/xmltok_impl.h
index e72b225c838..e72b225c838 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/xmltok_impl.h
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/xmltok_impl.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/xmltok_ns.c b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/xmltok_ns.c
index 77d0e739df0..77d0e739df0 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmltok/xmltok_ns.c
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmltok/xmltok_ns.c
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlwf/codepage.c b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlwf/codepage.c
index ac7c3e95796..ac7c3e95796 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlwf/codepage.c
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlwf/codepage.c
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlwf/codepage.h b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlwf/codepage.h
index bd8eba019f9..bd8eba019f9 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlwf/codepage.h
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlwf/codepage.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlwf/filemap.h b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlwf/filemap.h
index d4e9b59887e..d4e9b59887e 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlwf/filemap.h
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlwf/filemap.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlwf/readfilemap.c b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlwf/readfilemap.c
index c9bbb243e3b..c9bbb243e3b 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlwf/readfilemap.c
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlwf/readfilemap.c
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlwf/unixfilemap.c b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlwf/unixfilemap.c
index 0ff677d59a7..0ff677d59a7 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlwf/unixfilemap.c
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlwf/unixfilemap.c
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlwf/win32filemap.c b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlwf/win32filemap.c
index acbc62740eb..acbc62740eb 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlwf/win32filemap.c
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlwf/win32filemap.c
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlwf/xmlfile.c b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlwf/xmlfile.c
index d15d1a5e1c3..d15d1a5e1c3 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlwf/xmlfile.c
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlwf/xmlfile.c
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlwf/xmlfile.h b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlwf/xmlfile.h
index 5a1af2e49cc..5a1af2e49cc 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlwf/xmlfile.h
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlwf/xmlfile.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlwf/xmltchar.h b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlwf/xmltchar.h
index 1088575512d..1088575512d 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlwf/xmltchar.h
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlwf/xmltchar.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlwf/xmlwf.c b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlwf/xmlwf.c
index 1297a0c0b5b..1297a0c0b5b 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/expat/xmlwf/xmlwf.c
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/expat/xmlwf/xmlwf.c
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/sfReader.h b/Build/source/libs/teckit/TECkit-src/SFconv/sfReader.h
index 9576b2d31b7..9576b2d31b7 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/sfReader.h
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/sfReader.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/ushort_chartraits.h b/Build/source/libs/teckit/TECkit-src/SFconv/ushort_chartraits.h
index c9d0c85a1a0..c9d0c85a1a0 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/SFconv/ushort_chartraits.h
+++ b/Build/source/libs/teckit/TECkit-src/SFconv/ushort_chartraits.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/autogen.sh b/Build/source/libs/teckit/TECkit-src/autogen.sh
index e437c72251a..e437c72251a 100755
--- a/Build/source/libs/teckit/TECkit-2.5.4/autogen.sh
+++ b/Build/source/libs/teckit/TECkit-src/autogen.sh
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/bin/Makefile.am b/Build/source/libs/teckit/TECkit-src/bin/Makefile.am
index 2337f1d851d..2337f1d851d 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/bin/Makefile.am
+++ b/Build/source/libs/teckit/TECkit-src/bin/Makefile.am
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/configure.ac b/Build/source/libs/teckit/TECkit-src/configure.ac
index 10295f6a3d2..10295f6a3d2 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/configure.ac
+++ b/Build/source/libs/teckit/TECkit-src/configure.ac
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/docs/Calling_TECkit_from_VB.doc b/Build/source/libs/teckit/TECkit-src/docs/Calling_TECkit_from_VB.doc
index 4794b779f96..4794b779f96 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/docs/Calling_TECkit_from_VB.doc
+++ b/Build/source/libs/teckit/TECkit-src/docs/Calling_TECkit_from_VB.doc
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/docs/Makefile.am b/Build/source/libs/teckit/TECkit-src/docs/Makefile.am
index 882c16bf27b..882c16bf27b 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/docs/Makefile.am
+++ b/Build/source/libs/teckit/TECkit-src/docs/Makefile.am
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/docs/TECkit_Binary_Format.doc b/Build/source/libs/teckit/TECkit-src/docs/TECkit_Binary_Format.doc
index 4dabd2b3f40..4dabd2b3f40 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/docs/TECkit_Binary_Format.doc
+++ b/Build/source/libs/teckit/TECkit-src/docs/TECkit_Binary_Format.doc
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/docs/TECkit_Binary_Format.doc.pdf b/Build/source/libs/teckit/TECkit-src/docs/TECkit_Binary_Format.doc.pdf
index 80bca0483e6..80bca0483e6 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/docs/TECkit_Binary_Format.doc.pdf
+++ b/Build/source/libs/teckit/TECkit-src/docs/TECkit_Binary_Format.doc.pdf
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/docs/TECkit_Language_2.1.doc b/Build/source/libs/teckit/TECkit-src/docs/TECkit_Language_2.1.doc
index dd83d63158a..dd83d63158a 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/docs/TECkit_Language_2.1.doc
+++ b/Build/source/libs/teckit/TECkit-src/docs/TECkit_Language_2.1.doc
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/docs/TECkit_Language_2.1.doc.pdf b/Build/source/libs/teckit/TECkit-src/docs/TECkit_Language_2.1.doc.pdf
index a77700e61f2..a77700e61f2 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/docs/TECkit_Language_2.1.doc.pdf
+++ b/Build/source/libs/teckit/TECkit-src/docs/TECkit_Language_2.1.doc.pdf
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/docs/TECkit_version_2.1.doc b/Build/source/libs/teckit/TECkit-src/docs/TECkit_version_2.1.doc
index 82782c1d48c..82782c1d48c 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/docs/TECkit_version_2.1.doc
+++ b/Build/source/libs/teckit/TECkit-src/docs/TECkit_version_2.1.doc
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/docs/TECkit_version_2.1.doc.pdf b/Build/source/libs/teckit/TECkit-src/docs/TECkit_version_2.1.doc.pdf
index f85926b641d..f85926b641d 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/docs/TECkit_version_2.1.doc.pdf
+++ b/Build/source/libs/teckit/TECkit-src/docs/TECkit_version_2.1.doc.pdf
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/installed-top.pc.in b/Build/source/libs/teckit/TECkit-src/installed-top.pc.in
index 7609afda4e4..7609afda4e4 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/installed-top.pc.in
+++ b/Build/source/libs/teckit/TECkit-src/installed-top.pc.in
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/lib/Makefile.am b/Build/source/libs/teckit/TECkit-src/lib/Makefile.am
index 4adfcad4ec6..4adfcad4ec6 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/lib/Makefile.am
+++ b/Build/source/libs/teckit/TECkit-src/lib/Makefile.am
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/license/LICENSING.txt b/Build/source/libs/teckit/TECkit-src/license/LICENSING.txt
index 4f3add71197..4f3add71197 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/license/LICENSING.txt
+++ b/Build/source/libs/teckit/TECkit-src/license/LICENSING.txt
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/license/License_CPLv05.txt b/Build/source/libs/teckit/TECkit-src/license/License_CPLv05.txt
index 4cac5dfe069..4cac5dfe069 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/license/License_CPLv05.txt
+++ b/Build/source/libs/teckit/TECkit-src/license/License_CPLv05.txt
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/license/License_LGPLv21.txt b/Build/source/libs/teckit/TECkit-src/license/License_LGPLv21.txt
index 807db791666..807db791666 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/license/License_LGPLv21.txt
+++ b/Build/source/libs/teckit/TECkit-src/license/License_LGPLv21.txt
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Carbon.r b/Build/source/libs/teckit/TECkit-src/source/Carbon.r
index e0ac5b449ef..e0ac5b449ef 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Carbon.r
+++ b/Build/source/libs/teckit/TECkit-src/source/Carbon.r
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Compiler.cpp b/Build/source/libs/teckit/TECkit-src/source/Compiler.cpp
index a82c5d69c2e..a82c5d69c2e 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Compiler.cpp
+++ b/Build/source/libs/teckit/TECkit-src/source/Compiler.cpp
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Compiler.h b/Build/source/libs/teckit/TECkit-src/source/Compiler.h
index 33f0ab98494..33f0ab98494 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Compiler.h
+++ b/Build/source/libs/teckit/TECkit-src/source/Compiler.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Compiler_ver.rc b/Build/source/libs/teckit/TECkit-src/source/Compiler_ver.rc
index 5203e3e430f..5203e3e430f 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Compiler_ver.rc
+++ b/Build/source/libs/teckit/TECkit-src/source/Compiler_ver.rc
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Engine.cpp b/Build/source/libs/teckit/TECkit-src/source/Engine.cpp
index 9aef164cc34..9aef164cc34 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Engine.cpp
+++ b/Build/source/libs/teckit/TECkit-src/source/Engine.cpp
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Engine.h b/Build/source/libs/teckit/TECkit-src/source/Engine.h
index f40001d3b35..f40001d3b35 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Engine.h
+++ b/Build/source/libs/teckit/TECkit-src/source/Engine.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Engine_ver.rc b/Build/source/libs/teckit/TECkit-src/source/Engine_ver.rc
index 3b380682016..3b380682016 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Engine_ver.rc
+++ b/Build/source/libs/teckit/TECkit-src/source/Engine_ver.rc
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/MakeNormData.pl b/Build/source/libs/teckit/TECkit-src/source/MakeNormData.pl
index 44b5f87bf45..44b5f87bf45 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/MakeNormData.pl
+++ b/Build/source/libs/teckit/TECkit-src/source/MakeNormData.pl
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/MakeUnicodeNames.pl b/Build/source/libs/teckit/TECkit-src/source/MakeUnicodeNames.pl
index e29439f51a3..e29439f51a3 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/MakeUnicodeNames.pl
+++ b/Build/source/libs/teckit/TECkit-src/source/MakeUnicodeNames.pl
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Makefile.am b/Build/source/libs/teckit/TECkit-src/source/Makefile.am
index 889ee430663..889ee430663 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Makefile.am
+++ b/Build/source/libs/teckit/TECkit-src/source/Makefile.am
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/NormalizationData.c b/Build/source/libs/teckit/TECkit-src/source/NormalizationData.c
index cff722f2d3a..cff722f2d3a 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/NormalizationData.c
+++ b/Build/source/libs/teckit/TECkit-src/source/NormalizationData.c
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Perl/Makefile.PL b/Build/source/libs/teckit/TECkit-src/source/Perl/Makefile.PL
index 6390f61f9c4..6390f61f9c4 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Perl/Makefile.PL
+++ b/Build/source/libs/teckit/TECkit-src/source/Perl/Makefile.PL
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Perl/TECkit.xs b/Build/source/libs/teckit/TECkit-src/source/Perl/TECkit.xs
index a5773e60c85..a5773e60c85 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Perl/TECkit.xs
+++ b/Build/source/libs/teckit/TECkit-src/source/Perl/TECkit.xs
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Perl/lib/Encode/TECkit.pm b/Build/source/libs/teckit/TECkit-src/source/Perl/lib/Encode/TECkit.pm
index 8d84f7e04de..8d84f7e04de 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Perl/lib/Encode/TECkit.pm
+++ b/Build/source/libs/teckit/TECkit-src/source/Perl/lib/Encode/TECkit.pm
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Perl/test.pl b/Build/source/libs/teckit/TECkit-src/source/Perl/test.pl
index 87bdaa8be87..87bdaa8be87 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Perl/test.pl
+++ b/Build/source/libs/teckit/TECkit-src/source/Perl/test.pl
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Perl/typemap b/Build/source/libs/teckit/TECkit-src/source/Perl/typemap
index 1b433bd537c..1b433bd537c 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Perl/typemap
+++ b/Build/source/libs/teckit/TECkit-src/source/Perl/typemap
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Prefix_Mac.h b/Build/source/libs/teckit/TECkit-src/source/Prefix_Mac.h
index 0e17301912a..0e17301912a 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Prefix_Mac.h
+++ b/Build/source/libs/teckit/TECkit-src/source/Prefix_Mac.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Prefix_Win32.h b/Build/source/libs/teckit/TECkit-src/source/Prefix_Win32.h
index fdbae90fb2e..fdbae90fb2e 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Prefix_Win32.h
+++ b/Build/source/libs/teckit/TECkit-src/source/Prefix_Win32.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Public-headers/Makefile.am b/Build/source/libs/teckit/TECkit-src/source/Public-headers/Makefile.am
index 6750a912f57..6750a912f57 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Public-headers/Makefile.am
+++ b/Build/source/libs/teckit/TECkit-src/source/Public-headers/Makefile.am
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Public-headers/TECkit_Common.h b/Build/source/libs/teckit/TECkit-src/source/Public-headers/TECkit_Common.h
index 19c3d674c7f..19c3d674c7f 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Public-headers/TECkit_Common.h
+++ b/Build/source/libs/teckit/TECkit-src/source/Public-headers/TECkit_Common.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Public-headers/TECkit_Compiler.h b/Build/source/libs/teckit/TECkit-src/source/Public-headers/TECkit_Compiler.h
index 35f8fae32bb..35f8fae32bb 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Public-headers/TECkit_Compiler.h
+++ b/Build/source/libs/teckit/TECkit-src/source/Public-headers/TECkit_Compiler.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Public-headers/TECkit_Engine.h b/Build/source/libs/teckit/TECkit-src/source/Public-headers/TECkit_Engine.h
index df68043c9b9..df68043c9b9 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Public-headers/TECkit_Engine.h
+++ b/Build/source/libs/teckit/TECkit-src/source/Public-headers/TECkit_Engine.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/REALplugin.cp b/Build/source/libs/teckit/TECkit-src/source/REALplugin.cp
index b561c462ab8..b561c462ab8 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/REALplugin.cp
+++ b/Build/source/libs/teckit/TECkit-src/source/REALplugin.cp
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Sample-tools/TECkit_Compile.cpp b/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TECkit_Compile.cpp
index b60726f9945..b60726f9945 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Sample-tools/TECkit_Compile.cpp
+++ b/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TECkit_Compile.cpp
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Sample-tools/TECkit_Compile_ver.rc b/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TECkit_Compile_ver.rc
index 0583f363639..0583f363639 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Sample-tools/TECkit_Compile_ver.rc
+++ b/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TECkit_Compile_ver.rc
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Sample-tools/TxtConv.cpp b/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TxtConv.cpp
index 65a6761f769..65a6761f769 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Sample-tools/TxtConv.cpp
+++ b/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TxtConv.cpp
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Sample-tools/TxtConv_ver.rc b/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TxtConv_ver.rc
index 25d1f33abf7..25d1f33abf7 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Sample-tools/TxtConv_ver.rc
+++ b/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TxtConv_ver.rc
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/Sample-tools/version_defs.h b/Build/source/libs/teckit/TECkit-src/source/Sample-tools/version_defs.h
index a7676c7bb16..a7676c7bb16 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/Sample-tools/version_defs.h
+++ b/Build/source/libs/teckit/TECkit-src/source/Sample-tools/version_defs.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/TECkit_Compiler.cmd b/Build/source/libs/teckit/TECkit-src/source/TECkit_Compiler.cmd
index cd28435b789..cd28435b789 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/TECkit_Compiler.cmd
+++ b/Build/source/libs/teckit/TECkit-src/source/TECkit_Compiler.cmd
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/TECkit_Compiler.exp b/Build/source/libs/teckit/TECkit-src/source/TECkit_Compiler.exp
index 689e71b0038..689e71b0038 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/TECkit_Compiler.exp
+++ b/Build/source/libs/teckit/TECkit-src/source/TECkit_Compiler.exp
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/TECkit_Engine.cmd b/Build/source/libs/teckit/TECkit-src/source/TECkit_Engine.cmd
index 5e675e044e4..5e675e044e4 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/TECkit_Engine.cmd
+++ b/Build/source/libs/teckit/TECkit-src/source/TECkit_Engine.cmd
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/TECkit_Engine.exp b/Build/source/libs/teckit/TECkit-src/source/TECkit_Engine.exp
index 0b2bdeb9b06..0b2bdeb9b06 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/TECkit_Engine.exp
+++ b/Build/source/libs/teckit/TECkit-src/source/TECkit_Engine.exp
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/TECkit_Format.h b/Build/source/libs/teckit/TECkit-src/source/TECkit_Format.h
index 0cce751bd59..0cce751bd59 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/TECkit_Format.h
+++ b/Build/source/libs/teckit/TECkit-src/source/TECkit_Format.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/UnicodeNames.cpp b/Build/source/libs/teckit/TECkit-src/source/UnicodeNames.cpp
index 034be998628..034be998628 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/UnicodeNames.cpp
+++ b/Build/source/libs/teckit/TECkit-src/source/UnicodeNames.cpp
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/UpdateUnidata.sh b/Build/source/libs/teckit/TECkit-src/source/UpdateUnidata.sh
index 16d135ba2d8..16d135ba2d8 100755
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/UpdateUnidata.sh
+++ b/Build/source/libs/teckit/TECkit-src/source/UpdateUnidata.sh
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/test.cp b/Build/source/libs/teckit/TECkit-src/source/test.cp
index 4562e60945a..4562e60945a 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/test.cp
+++ b/Build/source/libs/teckit/TECkit-src/source/test.cp
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/ulong_chartraits.h b/Build/source/libs/teckit/TECkit-src/source/ulong_chartraits.h
index 85aa317b284..85aa317b284 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/ulong_chartraits.h
+++ b/Build/source/libs/teckit/TECkit-src/source/ulong_chartraits.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/source/version_defs.h b/Build/source/libs/teckit/TECkit-src/source/version_defs.h
index c7d09b58686..c7d09b58686 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/source/version_defs.h
+++ b/Build/source/libs/teckit/TECkit-src/source/version_defs.h
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/teckit.pc.in b/Build/source/libs/teckit/TECkit-src/teckit.pc.in
index a73e72f306e..a73e72f306e 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/teckit.pc.in
+++ b/Build/source/libs/teckit/TECkit-src/teckit.pc.in
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/test/GNT-map.xml b/Build/source/libs/teckit/TECkit-src/test/GNT-map.xml
index 2afecc955f0..2afecc955f0 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/test/GNT-map.xml
+++ b/Build/source/libs/teckit/TECkit-src/test/GNT-map.xml
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/test/ISO-8859-1.map b/Build/source/libs/teckit/TECkit-src/test/ISO-8859-1.map
index 96a428f3c31..96a428f3c31 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/test/ISO-8859-1.map
+++ b/Build/source/libs/teckit/TECkit-src/test/ISO-8859-1.map
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/test/Makefile.am b/Build/source/libs/teckit/TECkit-src/test/Makefile.am
index 009b736228e..009b736228e 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/test/Makefile.am
+++ b/Build/source/libs/teckit/TECkit-src/test/Makefile.am
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/test/Mrk-GNT.sf b/Build/source/libs/teckit/TECkit-src/test/Mrk-GNT.sf
index a032eb78023..a032eb78023 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/test/Mrk-GNT.sf
+++ b/Build/source/libs/teckit/TECkit-src/test/Mrk-GNT.sf
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/test/NormalizationTest.txt b/Build/source/libs/teckit/TECkit-src/test/NormalizationTest.txt
index 23c1e51d5f7..23c1e51d5f7 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/test/NormalizationTest.txt
+++ b/Build/source/libs/teckit/TECkit-src/test/NormalizationTest.txt
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/test/SILGreek2004-04-27.map b/Build/source/libs/teckit/TECkit-src/test/SILGreek2004-04-27.map
index 946b754d48d..946b754d48d 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/test/SILGreek2004-04-27.map
+++ b/Build/source/libs/teckit/TECkit-src/test/SILGreek2004-04-27.map
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/test/SILGreek2004-04-27.tec.orig b/Build/source/libs/teckit/TECkit-src/test/SILGreek2004-04-27.tec.orig
index 2094f0af84a..2094f0af84a 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/test/SILGreek2004-04-27.tec.orig
+++ b/Build/source/libs/teckit/TECkit-src/test/SILGreek2004-04-27.tec.orig
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/test/SILGreek2004-04-27.uncompressed.tec.orig b/Build/source/libs/teckit/TECkit-src/test/SILGreek2004-04-27.uncompressed.tec.orig
index 7450ee10ae8..7450ee10ae8 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/test/SILGreek2004-04-27.uncompressed.tec.orig
+++ b/Build/source/libs/teckit/TECkit-src/test/SILGreek2004-04-27.uncompressed.tec.orig
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/test/academy.tec b/Build/source/libs/teckit/TECkit-src/test/academy.tec
index e21103db882..e21103db882 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/test/academy.tec
+++ b/Build/source/libs/teckit/TECkit-src/test/academy.tec
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/test/dotests.pl b/Build/source/libs/teckit/TECkit-src/test/dotests.pl
index d8cc4267dd9..d8cc4267dd9 100755
--- a/Build/source/libs/teckit/TECkit-2.5.4/test/dotests.pl
+++ b/Build/source/libs/teckit/TECkit-src/test/dotests.pl
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/test/mrk.sf.legacy.txt.orig b/Build/source/libs/teckit/TECkit-src/test/mrk.sf.legacy.txt.orig
index a6240c210d3..a6240c210d3 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/test/mrk.sf.legacy.txt.orig
+++ b/Build/source/libs/teckit/TECkit-src/test/mrk.sf.legacy.txt.orig
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/test/mrk.txt b/Build/source/libs/teckit/TECkit-src/test/mrk.txt
index 5d1e03b4679..5d1e03b4679 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/test/mrk.txt
+++ b/Build/source/libs/teckit/TECkit-src/test/mrk.txt
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/test/silipa93.tec b/Build/source/libs/teckit/TECkit-src/test/silipa93.tec
index 53daa10b4bb..53daa10b4bb 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/test/silipa93.tec
+++ b/Build/source/libs/teckit/TECkit-src/test/silipa93.tec
diff --git a/Build/source/libs/teckit/TECkit-2.5.4/uninstalled-top.pc.in b/Build/source/libs/teckit/TECkit-src/uninstalled-top.pc.in
index e6dff4bb12e..e6dff4bb12e 100644
--- a/Build/source/libs/teckit/TECkit-2.5.4/uninstalled-top.pc.in
+++ b/Build/source/libs/teckit/TECkit-src/uninstalled-top.pc.in
diff --git a/Build/source/libs/teckit/configure b/Build/source/libs/teckit/configure
index c978e403820..6b2c3dfa71e 100755
--- a/Build/source/libs/teckit/configure
+++ b/Build/source/libs/teckit/configure
@@ -585,7 +585,7 @@ PACKAGE_STRING='TECkit (TeX Live) 2.5.4'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="TECkit-2.5.4/source/UnicodeNames.cpp"
+ac_unique_file="TECkit-src/source/UnicodeNames.cpp"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -6695,7 +6695,7 @@ fi
 $as_echo "#define HAVE_LIBZ 1" >>confdefs.h
 
 
-TECKIT_TREE=TECkit-2.5.4
+TECKIT_TREE=TECkit-src
 
 
 ac_config_files="$ac_config_files Makefile include/teckit/Makefile"
diff --git a/Build/source/libs/teckit/configure.ac b/Build/source/libs/teckit/configure.ac
index 955d8c4d9a2..1a5451aa6b3 100644
--- a/Build/source/libs/teckit/configure.ac
+++ b/Build/source/libs/teckit/configure.ac
@@ -9,7 +9,7 @@ dnl
 m4_include([version.ac])[] dnl define zziplib_version
 AC_INIT([TECkit (TeX Live)], TECkit_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
-AC_CONFIG_SRCDIR([TECkit-]TECkit_version[/source/UnicodeNames.cpp])
+AC_CONFIG_SRCDIR([TECkit-src/source/UnicodeNames.cpp])
 AC_CONFIG_AUX_DIR([../../build-aux])
 AC_CONFIG_MACRO_DIR([../../m4])
 
@@ -49,7 +49,7 @@ fi
 
 AC_DEFINE([HAVE_LIBZ], 1, [Define if you have zlib.])
 
-AC_SUBST([TECKIT_TREE], [TECkit-]TECkit_version)
+AC_SUBST([TECKIT_TREE], [TECkit-src])
 
 AC_CONFIG_FILES([Makefile include/teckit/Makefile])