]> granicus.if.org Git - python/commitdiff
Fix for issue5196, patch by Ned Deily.
authorRonald Oussoren <ronaldoussoren@mac.com>
Thu, 12 Feb 2009 15:18:15 +0000 (15:18 +0000)
committerRonald Oussoren <ronaldoussoren@mac.com>
Thu, 12 Feb 2009 15:18:15 +0000 (15:18 +0000)
Mac/Makefile.in

index 2a5603df4a90f9c733d3876353bd461137665a8a..f697a19723f15d9ecbdd4c9334a376dd2cc6b4d7 100644 (file)
@@ -49,7 +49,7 @@ installapps: install_Python install_PythonLauncher install_IDLE \
        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 @@ install_IDLE:
        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 @@ install_IDLE:
        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