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
........

diff --git a/Mac/Makefile.in b/Mac/Makefile.in
index 31d3b9f42274f34778fcd6d556d121d562cc95cc..5fb5cd46cc0d5d6a8c08b5368462f9495d8828fd 100644 (file)
--- 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 bd50f5cec2ea0189ac68d21cde82e5308aa60831..5fc59b574a8cc97494c8bdb6250ca5e11b907b44 100644 (file)
--- 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;
 }