From 04087b56ec8a3b46913207e199428f0e8d553dfd Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Tue, 25 Feb 2003 12:41:10 +0000
Subject: [PATCH] In Mac OS X framework builds don't assume that the executable
 will be called python.exe but actually pass it from the main Makefile to
 Mac/OSX/Makefile. This makes framework builds work again on case sensitive
 filesystems. Fixes bug #677753.

---
 Mac/OSX/Makefile | 12 ++++++------
 Makefile.pre.in  |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Mac/OSX/Makefile b/Mac/OSX/Makefile
index a3ca1ffa02..5f8d627978 100644
--- a/Mac/OSX/Makefile
+++ b/Mac/OSX/Makefile
@@ -8,6 +8,7 @@ srcdir = ../..
 dstroot=/.
 prefix=$(dstroot)/Library/Frameworks/Python.framework/Versions/$(VERSION)
 LIBDEST=$(prefix)/lib/python$(VERSION)
+BUILDPYTHON=$(builddir)/python.exe
 
 # These are normally glimpsed from the previous set
 bindir=$(dstroot)/usr/local/bin
@@ -41,7 +42,6 @@ STRIPFLAG=-s
 ##LD=cc
 CPMAC=/Developer/Tools/CpMac
 
-PYTHON=$(builddir)/python.exe
 APPTEMPLATE=$(srcdir)/Mac/OSXResources/app
 APPSUBDIRS=MacOS Resources Resources/English.lproj
 CACHERSRC=$(srcdir)/Mac/scripts/cachersrc.py
@@ -56,7 +56,7 @@ install_PythonLauncher:
 	pbxbuild -target PythonLauncher -buildstyle Deployment \
 		DSTROOT=$(dstroot) INSTALL_PATH=$(PYTHONAPPSPATH) install
 	
-install_Python: $(PYTHON)
+install_Python:
 	@for i in $(PYTHONAPPSDIR) $(APPINSTALLDIR) $(APPINSTALLDIR)/Contents; do \
 		if test ! -d $$i; then \
 			echo "Creating directory $$i"; \
@@ -94,7 +94,7 @@ install_Python: $(PYTHON)
 			esac; \
 		done; \
 	done
-	$(INSTALL_PROGRAM) $(STRIPFLAG) $(PYTHON) $(APPINSTALLDIR)/Contents/MacOS/python
+	$(INSTALL_PROGRAM) $(STRIPFLAG) $(BUILDPYTHON) $(APPINSTALLDIR)/Contents/MacOS/python
 # Finally create the documentation symlink
 	$(LN) -fsn ../../../../English.lproj/Documentation $(APPINSTALLDIR)/Contents/Resources/English.lproj/Documentation
 	
@@ -207,9 +207,9 @@ installmacsubtree:
 	
 	$(INSTALL_DATA) $(PTHFILE) $(LIBDEST)/site-packages/
 
-	$(PYTHON) $(CACHERSRC) -v $(MACLIBDEST) $(MACTOOLSDEST)
-	$(PYTHON) -Wi -tt $(compileall) -x badsyntax $(MACTOOLSDEST)
-	$(PYTHON) -O -Wi -tt $(compileall) -x badsyntax $(MACTOOLSDEST)
+	$(BUILDPYTHON) $(CACHERSRC) -v $(MACLIBDEST) $(MACTOOLSDEST)
+	$(BUILDPYTHON) -Wi -tt $(compileall) -x badsyntax $(MACTOOLSDEST)
+	$(BUILDPYTHON) -O -Wi -tt $(compileall) -x badsyntax $(MACTOOLSDEST)
 
 #
 # We use the full name here in stead of $(INSTALLED_PYTHONW), because
diff --git a/Makefile.pre.in b/Makefile.pre.in
index dd62c330f3..ae54905a45 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -833,11 +833,13 @@ frameworkinstallstructure:	$(LDLIBRARY)
 # This installs Mac/Lib into the framework
 frameworkinstallmaclib:
 	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installmacsubtree \
+		BUILDPYTHON=./$(BUILDPYTHON) \
 		srcdir=$(srcdir) builddir=. prefix=$(prefix) LIBDEST=$(LIBDEST)
 
 # This installs the IDE, the Launcher and other apps into /Applications
 frameworkinstallapps:
 	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installapps \
+		BUILDPYTHON=./$(BUILDPYTHON) \
 		srcdir=$(srcdir) builddir=. dstroot=$(PYTHONFRAMEWORKPREFIX)/../..
 
 # This install the unix python and pythonw tools in /usr/local/bin
-- 
2.40.0