In the altbininstall target, which is the first subtarget for "make install",

if we are running in an OSX framework enabled build directory, test that
the framework infrastructure exists. This catches the very common
error of doing "make install" in stead of "make frameworkinstall".

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 608f05ee345b1ae553fa17d8f68f08e25e670a57..dbde5a0579cf5156208768f1e0a0da96ad3c9a02 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -569,6 +569,12 @@ bininstall:        altbininstall
 # Install the interpreter with $(VERSION) affixed
 # This goes into $(exec_prefix)
 altbininstall: $(BUILDPYTHON)
+       @if test "$(PYTHONFRAMEWORKDIR)" != no-framework; then \
+               if test ! -f $(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current/Resources/Info.plist; then \
+                       echo 'Framework build: use "make frameworkinstall" in stead of "make install"'; \
+                       exit 1; \
+               fi; \
+       fi
        @for i in $(BINDIR) $(LIBDIR); \
        do \
                if test ! -d $$i; then \
@@ -770,7 +776,7 @@ sharedinstall:
 # automatically set prefix to the location deep down in the framework, so we
 # only have to cater for the structural bits of the framework.
 
-frameworkinstall: install frameworkinfrastructureinstall
+frameworkinstall: frameworkinfrastructureinstall install
 FRAMEWORKFINALDEST=$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)
 frameworkinfrastructureinstall:        $(LDLIBRARY)
        @if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \