[Python-checkins] r69537 - in python/branches/release30-maint: Mac/Makefile.in

[ronald.oussoren]

Author: ronald.oussoren
Date: Thu Feb 12 16:19:14 2009
New Revision: 69537

Log:
Merged revisions 69536 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r69536 | ronald.oussoren | 2009-02-12 16:18:15 +0100 (Thu, 12 Feb 2009) | 2 lines
  
  Fix for issue5196, patch by Ned Deily.
........


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Mac/Makefile.in

Modified: python/branches/release30-maint/Mac/Makefile.in
==============================================================================
--- python/branches/release30-maint/Mac/Makefile.in	(original)
+++ python/branches/release30-maint/Mac/Makefile.in	Thu Feb 12 16:19:14 2009
@@ -49,7 +49,7 @@
 	checkapplepython install_pythonw install_versionedtools
 
 installapps4way: install_Python4way install_PythonLauncher \
-	install_IDLE install_pythonw4way install_versionedtools
+	install_IDLE4way install_pythonw4way install_versionedtools
 
 
 install_pythonw: pythonw
@@ -217,7 +217,7 @@
 	test -d "$(DESTDIR)$(PYTHONAPPSDIR)" || mkdir -p "$(DESTDIR)$(PYTHONAPPSDIR)"
 	-test -d "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app" && rm -rf "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app"
 	/bin/cp -PR "$(srcdir)/IDLE/IDLE.app" "$(DESTDIR)$(PYTHONAPPSDIR)"
-	ln -sf $(INSTALLED_PYTHONAPP) "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/MacOS/Python"
+	ln -sf "$(INSTALLED_PYTHONAPP)" "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/MacOS/Python"
 	sed -e "s!%prefix%!$(prefix)!g" -e 's!%exe%!$(PYTHONFRAMEWORK)!g' < "$(srcdir)/IDLE/IDLE.app/Contents/MacOS/IDLE" > "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/MacOS/IDLE"
 	sed "s!%version%!`$(RUNSHARED) $(BUILDPYTHON) -c 'import platform; print(platform.python_version())'`!g" < "$(srcdir)/IDLE/IDLE.app/Contents/Info.plist" > "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/Info.plist"
 	if [ -f "$(DESTDIR)$(LIBDEST)/idlelib/config-main.def" ]; then \
@@ -239,6 +239,11 @@
 	fi
 	touch "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app"
 
+install_IDLE4way: install_IDLE
+	ln -sf "$(INSTALLED_PYTHONAPP)-32" "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/MacOS/Python"
+	sed -e "s!%prefix%!$(prefix)!g" -e 's!%exe%!$(PYTHONFRAMEWORK)-32!g' < "$(srcdir)/IDLE/IDLE.app/Contents/MacOS/IDLE" > "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/MacOS/IDLE"
+	touch "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app"
+
 $(INSTALLED_PYTHONAPP): install_Python
 
 installextras: $(srcdir)/Extras.ReadMe.txt $(srcdir)/Extras.install.py