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 c66190ce9264fe3bfdb36cd5616febae559dea66..afb06cc02f6b3c5466dcd9dfd3b708b41e387e31 100644 (file)
--- 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 991a738d8c3b2b63551255cc83cd1be4a296cf86..448e324d10da59b18cc63e4c0619b1dd14ee1168 100644 (file)
--- 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;
 }