Integrate installing a framework in the 'make install'
target. Until now users had to use 'make frameworkinstall'
to install python when it is configured with '--enable-framework'.
This tends to confuse users that don't hunt for readme files
hidden in platform specific directories :-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 782bc60..a41ded3 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -614,7 +614,7 @@
$(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS)
# Install everything
-install: altinstall bininstall maninstall
+install: @FRAMEWORKINSTALLFIRST@ altinstall bininstall maninstall @FRAMEWORKINSTALLLAST@
# Install almost everything without disturbing previous versions
altinstall: altbininstall libinstall inclinstall libainstall \
@@ -899,8 +899,10 @@
# subtargets install specific parts. Much of the actual work is offloaded to
# the Makefile in Mac/OSX
#
-frameworkinstall: frameworkinstallframework \
- frameworkinstallapps frameworkinstallunixtools
+#
+# This target is here for backward compatiblity, previous versions of Python
+# hadn't integrated framework installation in the normal install process.
+frameworkinstall: install
# On install, we re-make the framework
# structure in the install location, /Library/Frameworks/ or the argument to