diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-03-07 09:14:06 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-03-07 09:14:06 (GMT) |
| commit | b366cda5e0fe103085e0470516984a5679890705 (patch) | |
| tree | 9424c47af27b79a5ea2a989b6f2488e72ca9facf | |
| parent | 57de4c45ff81e7bd75123d56129153a9d6711a8b (diff) | |
| download | cpython-b366cda5e0fe103085e0470516984a5679890705.zip cpython-b366cda5e0fe103085e0470516984a5679890705.tar.gz cpython-b366cda5e0fe103085e0470516984a5679890705.tar.bz2 | |
Merged revisions 78755 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78755 | ronald.oussoren | 2010-03-07 10:04:06 +0100 (Sun, 07 Mar 2010) | 3 lines
Fix for issue #7998: pythonw didn't work when --with-framework-name was
specified
........
| -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 31d3b9f..5fb5cd4 100644 --- a/Mac/Makefile.in +++ b/Mac/Makefile.in @@ -111,7 +111,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 bd50f5c..5fc59b5 100644 --- a/Mac/Tools/pythonw.c +++ b/Mac/Tools/pythonw.c @@ -81,7 +81,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; } |