summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2009-02-12 15:18:15 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2009-02-12 15:18:15 (GMT)
commit672f62ae2622ac225a75cac850b7b040ca014a7a (patch)
tree04ae5650af58dec74183687fd722a14f91d0149d
parent711b578da5b04d3c12e8fab2982c5821174df8b8 (diff)
downloadcpython-672f62ae2622ac225a75cac850b7b040ca014a7a.zip
cpython-672f62ae2622ac225a75cac850b7b040ca014a7a.tar.gz
cpython-672f62ae2622ac225a75cac850b7b040ca014a7a.tar.bz2
Fix for issue5196, patch by Ned Deily.
-rw-r--r--Mac/Makefile.in9
1 files changed, 7 insertions, 2 deletions
diff --git a/Mac/Makefile.in b/Mac/Makefile.in
index 2a5603d..f697a19 100644
--- a/Mac/Makefile.in
+++ b/Mac/Makefile.in
@@ -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