[Python-checkins] r78755 - in python/trunk/Mac: Makefile.in Tools/pythonw.c

[ronald.oussoren]

Author: ronald.oussoren
Date: Sun Mar  7 10:04:06 2010
New Revision: 78755

Log:
Fix for issue #7998: pythonw didn't work when --with-framework-name was
specified


Modified:
   python/trunk/Mac/Makefile.in
   python/trunk/Mac/Tools/pythonw.c

Modified: python/trunk/Mac/Makefile.in
==============================================================================
--- python/trunk/Mac/Makefile.in	(original)
+++ python/trunk/Mac/Makefile.in	Sun Mar  7 10:04:06 2010
@@ -114,7 +114,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/trunk/Mac/Tools/pythonw.c
==============================================================================
--- python/trunk/Mac/Tools/pythonw.c	(original)
+++ python/trunk/Mac/Tools/pythonw.c	Sun Mar  7 10:04:06 2010
@@ -79,7 +79,7 @@
 	if (end[1] == '.') {
 		end++;
 	}
-	strcpy(end, "Resources/Python.app/Contents/MacOS/Python");
+	strcpy(end, "Resources/Python.app/Contents/MacOS/" PYTHONFRAMEWORK);
 
 	return g_path;
 }