Added missing dirs to LIBSUBDIRS, and reformatted it so it's easier to read

and maintain. Fixes #557482.

diff --git a/Mac/OSX/Makefile b/Mac/OSX/Makefile
index ed4bab19b82625e7cf57cfa39cbc9b8e3a2ad832..f7baeb4546f0ddbd20217761b85dbb8d9de29dd4 100644 (file)
--- a/Mac/OSX/Makefile
+++ b/Mac/OSX/Makefile
@@ -90,9 +90,20 @@ install: pythonforbundle
                
 LIBDEST=$(INSTALLDIR)/Mac/Lib
 LIBSRC=$(PYTHONBUILDDIR)/Mac/Lib
-LIBSUBDIRS=Carbon lib-scriptpackages lib-scriptpackages/CodeWarrior lib-scriptpackages/Explorer \
-       lib-scriptpackages/Finder lib-scriptpackages/Netscape lib-scriptpackages/StdSuites \
-       mkcwproject mkcwproject/template mkcwproject/template-carbon mkcwproject/template-ppc
+LIBSUBDIRS= \
+       Carbon \
+       lib-scriptpackages \
+       lib-scriptpackages/_builtinSuites \
+       lib-scriptpackages/CodeWarrior \
+       lib-scriptpackages/Explorer \
+       lib-scriptpackages/Finder \
+       lib-scriptpackages/Netscape \
+       lib-scriptpackages/StdSuites \
+       lib-scriptpackages/Terminal \
+       mkcwproject \
+       mkcwproject/template \
+       mkcwproject/template-carbon \
+       mkcwproject/template-ppc
 TOOLSDEST=$(INSTALLDIR)/Mac/Tools
 TOOLSSRC=$(PYTHONBUILDDIR)/Mac/Tools
 TOOLSSUBDIRS=IDE