diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-03-07 09:04:06 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-03-07 09:04:06 (GMT) |
| commit | 2a4ab816332a67150fcc8ece255fb1ee8e66af83 (patch) | |
| tree | da01c133e0e6fcb2cc7bb907d5d444439b348f10 /Mac | |
| parent | 4e6294921726bd2c4197c012fd5cbc3905ba7560 (diff) | |
| download | cpython-2a4ab816332a67150fcc8ece255fb1ee8e66af83.zip cpython-2a4ab816332a67150fcc8ece255fb1ee8e66af83.tar.gz cpython-2a4ab816332a67150fcc8ece255fb1ee8e66af83.tar.bz2 | |
Fix for issue #7998: pythonw didn't work when --with-framework-name was
specified
Diffstat (limited to 'Mac')
| -rw-r--r-- | Mac/Makefile.in | 2 | ||||
| -rw-r--r-- | Mac/Tools/pythonw.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Mac/Makefile.in b/Mac/Makefile.in index c66190c..afb06cc 100644 --- a/Mac/Makefile.in +++ b/Mac/Makefile.in @@ -114,7 +114,7 @@ install_versionedtools: pythonw: $(srcdir)/Tools/pythonw.c Makefile - $(CC) $(LDFLAGS) -o $@ $(srcdir)/Tools/pythonw.c -I.. -I$(srcdir)/../Include ../$(PYTHONFRAMEWORK).framework/Versions/$(VERSION)/$(PYTHONFRAMEWORK) + $(CC) $(LDFLAGS) -DPYTHONFRAMEWORK='"$(PYTHONFRAMEWORK)"' -o $@ $(srcdir)/Tools/pythonw.c -I.. -I$(srcdir)/../Include ../$(PYTHONFRAMEWORK).framework/Versions/$(VERSION)/$(PYTHONFRAMEWORK) install_PythonLauncher: cd PythonLauncher && make install DESTDIR=$(DESTDIR) diff --git a/Mac/Tools/pythonw.c b/Mac/Tools/pythonw.c index 991a738..448e324 100644 --- a/Mac/Tools/pythonw.c +++ b/Mac/Tools/pythonw.c @@ -79,7 +79,7 @@ static char* get_python_path(void) if (end[1] == '.') { end++; } - strcpy(end, "Resources/Python.app/Contents/MacOS/Python"); + strcpy(end, "Resources/Python.app/Contents/MacOS/" PYTHONFRAMEWORK); return g_path; } |