summaryrefslogtreecommitdiffstats
path: root/Mac
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2009-01-02 11:48:29 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2009-01-02 11:48:29 (GMT)
commitaf1186071a3666277da8725e19056282d407fd5b (patch)
treec0ca3b2e770a56c3e7d37bdfb0e3dd220b8bb4aa /Mac
parent374e220bcb1ee71053c18c0b4e409cfa69881722 (diff)
downloadcpython-af1186071a3666277da8725e19056282d407fd5b.zip
cpython-af1186071a3666277da8725e19056282d407fd5b.tar.gz
cpython-af1186071a3666277da8725e19056282d407fd5b.tar.bz2
Fix for issue 3433
Diffstat (limited to 'Mac')
-rw-r--r--Mac/Makefile.in4
-rw-r--r--Mac/PythonLauncher/Makefile.in2
2 files changed, 3 insertions, 3 deletions
diff --git a/Mac/Makefile.in b/Mac/Makefile.in
index a5cb362..f28d1ea 100644
--- a/Mac/Makefile.in
+++ b/Mac/Makefile.in
@@ -216,9 +216,9 @@ install_Python4way: install_Python
install_IDLE:
test -d "$(DESTDIR)$(PYTHONAPPSDIR)" || mkdir -p "$(DESTDIR)$(PYTHONAPPSDIR)"
-test -d "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app" && rm -r "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app"
- cp -PR "$(srcdir)/IDLE/IDLE.app" "$(DESTDIR)$(PYTHONAPPSDIR)"
+ /bin/cp -PR "$(srcdir)/IDLE/IDLE.app" "$(DESTDIR)$(PYTHONAPPSDIR)"
ln -sf $(INSTALLED_PYTHONAPP) "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/MacOS/Python"
- sed "s!%prefix%!$(prefix)!g" < "$(srcdir)/IDLE/IDLE.app/Contents/MacOS/IDLE" > "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/MacOS/IDLE"
+ 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"
touch "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app"
diff --git a/Mac/PythonLauncher/Makefile.in b/Mac/PythonLauncher/Makefile.in
index 2d8da33..96493ad 100644
--- a/Mac/PythonLauncher/Makefile.in
+++ b/Mac/PythonLauncher/Makefile.in
@@ -27,7 +27,7 @@ OBJECTS=FileSettings.o MyAppDelegate.o MyDocument.o PreferencesWindowController.
install: Python\ Launcher.app
test -d "$(DESTDIR)$(PYTHONAPPSDIR)" || mkdir -p "$(DESTDIR)$(PYTHONAPPSDIR)"
-test -d "$(DESTDIR)$(PYTHONAPPSDIR)/Python Launcher.app" && rm -r "$(DESTDIR)$(PYTHONAPPSDIR)/Python Launcher.app"
- cp -r "Python Launcher.app" "$(DESTDIR)$(PYTHONAPPSDIR)"
+ /bin/cp -r "Python Launcher.app" "$(DESTDIR)$(PYTHONAPPSDIR)"
touch "$(DESTDIR)$(PYTHONAPPSDIR)/Python Launcher.app"