From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Tue, 24 May 2011 23:16:49 +0000 (+0200)
Subject: (Merge 3.2) Issue #12057: Add cjkencodings directory to the Makefile and
X-Git-Tag: v3.3.0a1~2183^2~118
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c520a1856fac2efbddc4379e4d9e8355f454e69c;p=python

(Merge 3.2) Issue #12057: Add cjkencodings directory to the Makefile and
Tools/msi/msi.py
---

c520a1856fac2efbddc4379e4d9e8355f454e69c
diff --cc Makefile.pre.in
index 04d126fde3,50ba086e29..dff1252999
--- a/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 \