Update of /cvsroot/python/python/dist/src/Mac/OSX In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2806/Mac/OSX Modified Files: Tag: release24-maint Makefile Log Message: Backport: Fix for #1091468: DESTROOTed frameworkinstalls fail. Added a --destroot option to various tools, and do the right thing when we're doing a destroot install. Index: Makefile =================================================================== RCS file: /cvsroot/python/python/dist/src/Mac/OSX/Makefile,v retrieving revision 1.54 retrieving revision 1.54.4.1 diff -u -d -r1.54 -r1.54.4.1 --- Makefile 2 Jun 2004 20:06:38 -0000 1.54 +++ Makefile 31 Dec 2004 11:23:20 -0000 1.54.4.1 @@ -2,7 +2,7 @@ # main Makefile. The next couple of variables are overridden on the # commandline in that case. -VERSION=2.4 +VERSION=2.5 builddir = ../.. srcdir = ../.. prefix=/Library/Frameworks/Python.framework/Versions/$(VERSION) @@ -120,10 +120,12 @@ echo See Mac/OSX/README for details; \ else \ echo $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \ + --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) \ --python $(INSTALLED_PYTHONW) \ --output $(DESTDIR)$(PYTHONAPPSDIR)/PythonIDE.app --noargv \ $(srcdir)/Mac/Tools/IDE/PythonIDE.py; \ @@ -136,6 +138,7 @@ else \ echo $(BUILDPYTHON) $(bundlebuilder) \ --builddir $(DESTDIR)$(PYTHONAPPSDIR)/ \ + --destroot $(DESTDIR) \ --python $(INSTALLED_PYTHONW) \ --resource $(srcdir)/Mac/Tools/IDE/PythonIDE.rsrc \ --mainprogram $(srcdir)/Mac/Tools/IDE/PackageManager.py \ @@ -143,6 +146,7 @@ --creator Pimp build; \ $(BUILDPYTHON) $(bundlebuilder) \ --builddir $(DESTDIR)$(PYTHONAPPSDIR)/ \ + --destroot $(DESTDIR) \ --python $(INSTALLED_PYTHONW) \ --resource $(srcdir)/Mac/Tools/IDE/PythonIDE.rsrc \ --mainprogram $(srcdir)/Mac/Tools/IDE/PackageManager.py \ @@ -157,11 +161,13 @@ else \ echo $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \ --python $(INSTALLED_PYTHONW) \ + --destroot $(DESTDIR) \ --output $(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app \ --extra $(srcdir)/Lib/idlelib \ $(srcdir)/Tools/scripts/idle ; \ $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \ --python $(INSTALLED_PYTHONW) \ + --destroot $(DESTDIR) \ --output $(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app \ --extra $(srcdir)/Lib/idlelib:Contents/Resources/idlelib \ $(srcdir)/Tools/scripts/idle ; \ @@ -170,6 +176,7 @@ install_BuildApplet: $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \ + --destroot $(DESTDIR) \ --python $(INSTALLED_PYTHONW) \ --output $(DESTDIR)$(PYTHONAPPSDIR)/BuildApplet.app \ $(srcdir)/Mac/scripts/BuildApplet.py