diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2008-05-02 19:45:11 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2008-05-02 19:45:11 (GMT) |
| commit | 580c7fec67eb233bb3b31db0f656174be032e6ed (patch) | |
| tree | 7784e56c7de5f4a793f18e5aac3aa3571a43dff6 /Mac/Makefile.in | |
| parent | ee340e501d2a59d70a91748ebd948787bfac8044 (diff) | |
| download | cpython-580c7fec67eb233bb3b31db0f656174be032e6ed.zip cpython-580c7fec67eb233bb3b31db0f656174be032e6ed.tar.gz cpython-580c7fec67eb233bb3b31db0f656174be032e6ed.tar.bz2 | |
Fix for issue #2573: Can't change the framework name on OS X builds
This introduces a new configure option: --with-framework-name=NAME
(defaulting to 'Python'). This allows you to install several copies
of the Python framework with different names (such as a normal build
and a debug build).
Diffstat (limited to 'Mac/Makefile.in')
| -rw-r--r-- | Mac/Makefile.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Mac/Makefile.in b/Mac/Makefile.in index 8b2e1db..34734d0 100644 --- a/Mac/Makefile.in +++ b/Mac/Makefile.in @@ -13,14 +13,16 @@ BUILDPYTHON=$(builddir)/python$(BUILDEXE) DESTDIR= LDFLAGS=@LDFLAGS@ FRAMEWORKUNIXTOOLSPREFIX=@FRAMEWORKUNIXTOOLSPREFIX@ +PYTHONFRAMEWORK=@PYTHONFRAMEWORK@ + # These are normally glimpsed from the previous set bindir=$(prefix)/bin -PYTHONAPPSDIR=/Applications/MacPython $(VERSION) +PYTHONAPPSDIR=/Applications/$(PYTHONFRAMEWORK) $(VERSION) APPINSTALLDIR=$(prefix)/Resources/Python.app # Variables for installing the "normal" unix binaries -INSTALLED_PYTHONAPP=$(APPINSTALLDIR)/Contents/MacOS/Python +INSTALLED_PYTHONAPP=$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK) # Items more-or-less copied from the main Makefile DIRMODE=755 @@ -103,7 +105,7 @@ install_versionedtools: pythonw: $(srcdir)/Tools/pythonw.c Makefile $(CC) $(LDFLAGS) -o $@ $(srcdir)/Tools/pythonw.c \ - -DPYTHONWEXECUTABLE='"$(APPINSTALLDIR)/Contents/MacOS/Python"' + -DPYTHONWEXECUTABLE='"$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)"' install_PythonLauncher: @@ -155,7 +157,7 @@ install_Python: esac; \ done; \ done - $(INSTALL_PROGRAM) $(STRIPFLAG) $(BUILDPYTHON) "$(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/Python" + $(INSTALL_PROGRAM) $(STRIPFLAG) $(BUILDPYTHON) "$(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)" install_IDLE: cd IDLE && make install |