From b366cda5e0fe103085e0470516984a5679890705 Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Sun, 7 Mar 2010 09:14:06 +0000 Subject: [PATCH] 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 ........ --- Mac/Makefile.in | 2 +- Mac/Tools/pythonw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Mac/Makefile.in b/Mac/Makefile.in index 31d3b9f4227..5fb5cd46cc0 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 bd50f5cec2e..5fc59b574a8 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; }