From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 7 Mar 2010 09:04:06 +0000 (+0000)
Subject: Fix for issue #7998: pythonw didn't work when --with-framework-name was
X-Git-Tag: v2.7b1~438
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a4ab816332a67150fcc8ece255fb1ee8e66af83;p=python

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 c66190ce92..afb06cc02f 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 991a738d8c..448e324d10 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;
 }