]> granicus.if.org Git - python/commitdiff
Fix for issue 3433
authorRonald Oussoren <ronaldoussoren@mac.com>
Fri, 2 Jan 2009 11:48:29 +0000 (11:48 +0000)
committerRonald Oussoren <ronaldoussoren@mac.com>
Fri, 2 Jan 2009 11:48:29 +0000 (11:48 +0000)
Mac/Makefile.in
Mac/PythonLauncher/Makefile.in

index a5cb3622f2f3408d8b26be2b436bb1a49c1c28a8..f28d1ea1936149eed992b936d5c1f43729f8ed82 100644 (file)
@@ -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"
 
index 2d8da33a8fbe3b60bca1076800af1553ce0042ba..96493ad678711d3e8d5f6ae0edd6f6b4a05917f0 100644 (file)
@@ -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"