[Python-checkins] r79058 - in python/branches/release31-maint: Makefile.pre.in

[benjamin.peterson]

Author: benjamin.peterson
Date: Thu Mar 18 22:38:55 2010
New Revision: 79058

Log:
Merged revisions 79057 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79057 | benjamin.peterson | 2010-03-18 16:36:06 -0500 (Thu, 18 Mar 2010) | 9 lines
  
  Merged revisions 79056 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r79056 | benjamin.peterson | 2010-03-18 16:32:38 -0500 (Thu, 18 Mar 2010) | 1 line
    
    install tkinter and ttk tests
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Makefile.pre.in

Modified: python/branches/release31-maint/Makefile.pre.in
==============================================================================
--- python/branches/release31-maint/Makefile.pre.in	(original)
+++ python/branches/release31-maint/Makefile.pre.in	Thu Mar 18 22:38:55 2010
@@ -834,7 +834,8 @@
 EXTRAPLATDIR= @EXTRAPLATDIR@
 MACHDEPS=	$(PLATDIR) $(EXTRAPLATDIR)
 XMLLIBSUBDIRS=  xml xml/dom xml/etree xml/parsers xml/sax
-LIBSUBDIRS=	tkinter site-packages test test/output test/data \
+LIBSUBDIRS=	tkinter tkinter/test tkinter/test/test_tkinter \
+                tkinter/test/test_ttk site-packages test test/data \
 		test/decimaltestdata \
 		encodings \
 		email email/mime email/test email/test/data \