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 ed4bab1..f7baeb4 100644
--- a/Mac/OSX/Makefile
+++ b/Mac/OSX/Makefile
@@ -90,9 +90,20 @@
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