diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2004-12-31 11:23:20 +0000 |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2004-12-31 11:23:20 +0000 |
| commit | 8d784e353f7169eebb75c8c8677a1b9e5fe2c19b (patch) | |
| tree | 9df7e00aeb71af617e4ebcf5c5fcb470c13ba2fd /Mac/OSX | |
| parent | 01b53e1f068d20ce3a9dace58f45be82b7eb85c6 (diff) | |
| download | cpython-git-8d784e353f7169eebb75c8c8677a1b9e5fe2c19b.tar.gz | |
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.
Diffstat (limited to 'Mac/OSX')
| -rw-r--r-- | Mac/OSX/Makefile | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Mac/OSX/Makefile b/Mac/OSX/Makefile index e8d15297d0..bfee43f0cc 100644 --- a/Mac/OSX/Makefile +++ b/Mac/OSX/Makefile @@ -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 @@ install_IDE: 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 @@ install_PackageManager: 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 @@ install_PackageManager: --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 @@ install_IDLE: 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_IDLE: install_BuildApplet: $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \ + --destroot $(DESTDIR) \ --python $(INSTALLED_PYTHONW) \ --output $(DESTDIR)$(PYTHONAPPSDIR)/BuildApplet.app \ $(srcdir)/Mac/scripts/BuildApplet.py |