Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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
........
This commit is contained in:
Ronald Oussoren 2010-03-07 09:14:06 +00:00
parent 57de4c45ff
commit b366cda5e0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mac/Makefile.in
View File

@ -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)

2
Mac/Tools/pythonw.c
View File

@ -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;
}