diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-04-30 11:20:14 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-04-30 11:20:14 (GMT) |
| commit | 01d149fc1f249f6dda24728c45cd89cf5ba99025 (patch) | |
| tree | 1123581f7927d46be08ea8fc5e0828643c1a6c66 /Mac | |
| parent | c121f130b50eaaef827b6973eaa1d5a71f48372e (diff) | |
| download | cpython-01d149fc1f249f6dda24728c45cd89cf5ba99025.zip cpython-01d149fc1f249f6dda24728c45cd89cf5ba99025.tar.gz cpython-01d149fc1f249f6dda24728c45cd89cf5ba99025.tar.bz2 | |
Fix for issue #3646: with this patch it is possible to do a
framework install of Python in your home directory (on OSX):
$ configure --enable-framework=${HOME}/Library/Frameworks
$ make && make install
Without this patch the framework would get installed just fine,
but 'make install' would try to install the application bundles
and command-line tools outside the user's home, which doesn't work
for non-admin users (and is bad form anyway).
Diffstat (limited to 'Mac')
| -rw-r--r-- | Mac/IDLE/Makefile.in | 2 | ||||
| -rw-r--r-- | Mac/Makefile.in | 2 | ||||
| -rw-r--r-- | Mac/PythonLauncher/Makefile.in | 2 | ||||
| -rw-r--r-- | Mac/README | 13 |
4 files changed, 15 insertions, 4 deletions
diff --git a/Mac/IDLE/Makefile.in b/Mac/IDLE/Makefile.in index 5446864..6ae360c 100644 --- a/Mac/IDLE/Makefile.in +++ b/Mac/IDLE/Makefile.in @@ -24,7 +24,7 @@ MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@ BUNDLEBULDER=$(srcdir)/../../Lib/plat-mac/bundlebuilder.py -PYTHONAPPSDIR=/Applications/$(PYTHONFRAMEWORK) $(VERSION) +PYTHONAPPSDIR=@FRAMEWORKINSTALLAPPSPREFIX@/$(PYTHONFRAMEWORK) $(VERSION) all: IDLE.app diff --git a/Mac/Makefile.in b/Mac/Makefile.in index 5c18209..12c1fcd 100644 --- a/Mac/Makefile.in +++ b/Mac/Makefile.in @@ -22,7 +22,7 @@ export MACOSX_DEPLOYMENT_TARGET # These are normally glimpsed from the previous set bindir=$(prefix)/bin -PYTHONAPPSDIR=/Applications/$(PYTHONFRAMEWORK) $(VERSION) +PYTHONAPPSDIR=@FRAMEWORKINSTALLAPPSPREFIX@/$(PYTHONFRAMEWORK) $(VERSION) APPINSTALLDIR=$(prefix)/Resources/Python.app # Variables for installing the "normal" unix binaries diff --git a/Mac/PythonLauncher/Makefile.in b/Mac/PythonLauncher/Makefile.in index 2551d23..a6962f6 100644 --- a/Mac/PythonLauncher/Makefile.in +++ b/Mac/PythonLauncher/Makefile.in @@ -21,7 +21,7 @@ MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@ BUNDLEBULDER=$(srcdir)/../../Lib/plat-mac/bundlebuilder.py -PYTHONAPPSDIR=/Applications/$(PYTHONFRAMEWORK) $(VERSION) +PYTHONAPPSDIR=@FRAMEWORKINSTALLAPPSPREFIX@/$(PYTHONFRAMEWORK) $(VERSION) OBJECTS=FileSettings.o MyAppDelegate.o MyDocument.o PreferencesWindowController.o doscript.o main.o all: Python\ Launcher.app @@ -8,13 +8,24 @@ the Python distribution. Mac-specific arguments to configure =================================== -* ``--enable-framework`` +* ``--enable-framework[=DIR]`` If this argument is specified the build will create a Python.framework rather than a traditional Unix install. See the section _`Building and using a framework-based Python on Mac OS X` for more information on frameworks. + If the optional directory argument is specified the framework it installed + into that directory. This can be used to install a python framework into + your home directory:: + + $ configure --enable-framework=/Users/ronald/Library/Frameworks + $ make && make install + + This will install the framework itself in ``/Users/ronald/Library/Frameworks``, + the applications in a subdirectory of ``/Users/ronald/Applications`` and the + command-line tools in ``/Users/ronald/bin``. + * ``--with-framework-name=NAME`` Specify the name for the python framework, defaults to ``Python``. This option |