[Python-checkins] r78756 - in python/branches/py3k: Mac/Makefile.in Mac/Tools/pythonw.c

[ronald.oussoren]

Author: ronald.oussoren
Date: Sun Mar  7 10:14:06 2010
New Revision: 78756

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Mac/Makefile.in
   python/branches/py3k/Mac/Tools/pythonw.c

Modified: python/branches/py3k/Mac/Makefile.in
==============================================================================
--- python/branches/py3k/Mac/Makefile.in	(original)
+++ python/branches/py3k/Mac/Makefile.in	Sun Mar  7 10:14:06 2010
@@ -111,7 +111,7 @@
 
 
 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)

Modified: python/branches/py3k/Mac/Tools/pythonw.c
==============================================================================
--- python/branches/py3k/Mac/Tools/pythonw.c	(original)
+++ python/branches/py3k/Mac/Tools/pythonw.c	Sun Mar  7 10:14:06 2010
@@ -81,7 +81,7 @@
 	if (end[1] == '.') {
 		end++;
 	}
-	strcpy(end, "Resources/Python.app/Contents/MacOS/Python");
+	strcpy(end, "Resources/Python.app/Contents/MacOS/" PYTHONFRAMEWORK);
 
 	return g_path;
 }