Merged revisions 78755 via svnmerge from

ronaldoussoren · ronaldoussoren · commit b366cda5e0fe · 2010-03-07T09:14:06.000Z
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
@@ -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
@@ -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;
 }

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ static char* get_python_path(void)`
`81`	`81`	`if (end[1] == '.') {`
`82`	`82`	`end++;`
`83`	`83`	`}`
`84`		`- strcpy(end, "Resources/Python.app/Contents/MacOS/Python");`
	`84`	`+ strcpy(end, "Resources/Python.app/Contents/MacOS/" PYTHONFRAMEWORK);`
`85`	`85`
`86`	`86`	`return g_path;`
`87`	`87`	`}`