(Merge 3.2) Issue #12057: Add cjkencodings directory to the Makefile and

Tools/msi/msi.py

diff --cc Makefile.pre.in
index 04d126fde3d0e1d765f0ac53d34805f7625b627f,50ba086e29942190b728f59fb5c607400ae4292f..dff1252999cf1fd7627d157d97c740b8c6d5d2ad
--- 1/Makefile.pre.in
--- 2/Makefile.pre.in
+++ b/Makefile.pre.in
@@@ -908,10 -909,10 +908,10 @@@ EXTRAPLATDIR= @EXTRAPLATDIR
  MACHDEPS=     $(PLATDIR) $(EXTRAPLATDIR)
  XMLLIBSUBDIRS=  xml xml/dom xml/etree xml/parsers xml/sax
  LIBSUBDIRS=   tkinter tkinter/test tkinter/test/test_tkinter \
-                 tkinter/test/test_ttk site-packages test \
-               test/decimaltestdata test/xmltestdata test/subprocessdata \
+               tkinter/test/test_ttk site-packages test \
+               test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
                test/tracedmodules test/encoded_modules \
 -              concurrent concurrent/futures encodings \
 +              collections concurrent concurrent/futures encodings \
                email email/mime email/test email/test/data \
                html json test/json_tests http dbm xmlrpc \
                sqlite3 sqlite3/test \