Backport of 1.55 and 1.57:

- Added quotes around the destroot arguments, so empty destroot works.
- Run fixapplepython23 script to check whether Apple's Python 2.3 needs
  to be patched.

diff --git a/Mac/OSX/Makefile b/Mac/OSX/Makefile
index cad27f6dec430f0efa5af2c453a1306cbec275c7..9e1acb6087d026258900e40827d4d5d5fce7bba8 100644 (file)
--- a/Mac/OSX/Makefile
+++ b/Mac/OSX/Makefile
@@ -61,7 +61,7 @@ compileall=$(srcdir)/Lib/compileall.py
 bundlebuilder=$(srcdir)/Lib/plat-mac/bundlebuilder.py
 
 installapps: install_PythonLauncher install_Python install_BuildApplet install_IDE \
-       install_IDLE install_PackageManager
+       install_IDLE install_PackageManager checkapplepython
 
 install_PythonLauncher:
        cd $(srcdir)/Mac/OSX/PythonLauncher/PythonLauncher.pbproj ; \
@@ -121,12 +121,12 @@ install_IDE:
                echo See Mac/OSX/README for details; \
        else \
                echo $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
-                   --destroot $(DESTDIR) \
+                   --destroot "$(DESTDIR)" \
                        --python $(INSTALLED_PYTHONW) \
                        --output $(DESTDIR)$(PYTHONAPPSDIR)/PythonIDE.app --noargv \
                        $(srcdir)/Mac/Tools/IDE/PythonIDE.py ; \
                $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
-                   --destroot $(DESTDIR) \
+                   --destroot "$(DESTDIR)" \
                        --python $(INSTALLED_PYTHONW) \
                        --output $(DESTDIR)$(PYTHONAPPSDIR)/PythonIDE.app --noargv \
                        $(srcdir)/Mac/Tools/IDE/PythonIDE.py; \
@@ -139,7 +139,7 @@ install_PackageManager:
        else \
                echo $(BUILDPYTHON) $(bundlebuilder) \
                        --builddir $(DESTDIR)$(PYTHONAPPSDIR)/ \
-                   --destroot $(DESTDIR) \
+                   --destroot "$(DESTDIR)" \
                        --python $(INSTALLED_PYTHONW) \
                        --resource $(srcdir)/Mac/Tools/IDE/PythonIDE.rsrc \
                        --mainprogram $(srcdir)/Mac/Tools/IDE/PackageManager.py \
@@ -148,7 +148,7 @@ install_PackageManager:
                        --creator Pimp build; \
                $(BUILDPYTHON) $(bundlebuilder) \
                        --builddir $(DESTDIR)$(PYTHONAPPSDIR)/ \
-                   --destroot $(DESTDIR) \
+                   --destroot "$(DESTDIR)" \
                        --python $(INSTALLED_PYTHONW) \
                        --resource $(srcdir)/Mac/Tools/IDE/PythonIDE.rsrc \
                        --mainprogram $(srcdir)/Mac/Tools/IDE/PackageManager.py \
@@ -164,13 +164,13 @@ install_IDLE:
        else \
                echo $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
                        --python $(INSTALLED_PYTHONW) \
-                       --destroot $(DESTDIR) \
+                   --destroot "$(DESTDIR)" \
                        --output $(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app \
                        --extra $(srcdir)/Lib/idlelib \
                        $(srcdir)/Lib/idlelib/idle ; \
                $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
                        --python $(INSTALLED_PYTHONW) \
-                       --destroot $(DESTDIR) \
+                       --destroot "$(DESTDIR)" \
                        --output $(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app \
                        --extra $(srcdir)/Lib/idlelib:Contents/Resources/idlelib \
                        $(srcdir)/Lib/idlelib/idle ; \
@@ -179,7 +179,7 @@ install_IDLE:
 
 install_BuildApplet:
        $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
-               --destroot $(DESTDIR) \
+               --destroot "$(DESTDIR)" \
                --python $(INSTALLED_PYTHONW) \
                --output $(DESTDIR)$(PYTHONAPPSDIR)/BuildApplet.app \
                $(srcdir)/Mac/scripts/BuildApplet.py
@@ -267,3 +267,10 @@ installextras:
                $(DESTDIR)$(PYTHONAPPSDIR)/Extras/Demo
        $(BUILDPYTHON) $(srcdir)/Mac/OSX/Extras.install.py $(srcdir)/Tools \
                $(DESTDIR)$(PYTHONAPPSDIR)/Extras/Tools
+
+checkapplepython:
+       @if ! $(BUILDPYTHON) $(srcdir)/Mac/OSX/fixapplepython23.py -n; then \
+               echo "* WARNING: Apple-installed Python 2.3 will have trouble building extensions from now on."; \
+               echo "* WARNING: Run $(srcdir)/Mac/OSX/fixapplepython23.py with \"sudo\" to fix this."; \
+       fi
+