From 3a451b1d1951b6f48c553e4cbc4b35ef4933cd2a Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Tue, 6 Aug 2002 13:40:31 +0000
Subject: [PATCH] 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".

---
 Makefile.pre.in | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 608f05ee34..dbde5a0579 100644
--- 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 \
-- 
2.50.1