diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2003-02-25 12:41:10 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2003-02-25 12:41:10 (GMT) |
| commit | 04087b56ec8a3b46913207e199428f0e8d553dfd (patch) | |
| tree | be7c73c6e9533a69e80d2c79f72fd105b659300f /Mac/OSX | |
| parent | dd8766a65bed9b86f9309f9b743b5d0f1074779e (diff) | |
| download | cpython-04087b56ec8a3b46913207e199428f0e8d553dfd.zip cpython-04087b56ec8a3b46913207e199428f0e8d553dfd.tar.gz cpython-04087b56ec8a3b46913207e199428f0e8d553dfd.tar.bz2 | |
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.
Diffstat (limited to 'Mac/OSX')
| -rw-r--r-- | Mac/OSX/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Mac/OSX/Makefile b/Mac/OSX/Makefile index a3ca1ff..5f8d627 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 |