diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-04-30 11:41:56 +0000 |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-04-30 11:41:56 +0000 |
| commit | c31b5212ab2a8b2fdb08ecd608b997410278b375 (patch) | |
| tree | ba617614d278241e927858bb1d54dc86f42168e5 /Mac | |
| parent | ac0af911cf4e10fe26faa2d45b6c097f4ca47174 (diff) | |
| download | cpython-c31b5212ab2a8b2fdb08ecd608b997410278b375.tar.gz | |
Merged revisions 80647 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80647 | ronald.oussoren | 2010-04-30 13:20:14 +0200 (Fri, 30 Apr 2010) | 11 lines
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/Makefile.in | 2 | ||||
| -rw-r--r-- | Mac/PythonLauncher/Makefile.in | 2 | ||||
| -rw-r--r-- | Mac/README | 13 |
3 files changed, 14 insertions, 3 deletions
diff --git a/Mac/Makefile.in b/Mac/Makefile.in index bea5f995e9..467bb32176 100644 --- a/Mac/Makefile.in +++ b/Mac/Makefile.in @@ -24,7 +24,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 539ed1a8d0..970b83f314 100644 --- a/Mac/PythonLauncher/Makefile.in +++ b/Mac/PythonLauncher/Makefile.in @@ -21,7 +21,7 @@ MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@ BUNDLEBULDER=$(srcdir)/../Tools/bundlebuilder.py -PYTHONAPPSDIR=/Applications/$(PYTHONFRAMEWORK) $(VERSION) +PYTHONAPPSDIR=@FRAMEWORKINSTALLAPPSPREFIX@/$(PYTHONFRAMEWORK) $(VERSION) OBJECTS=FileSettings.o MyAppDelegate.o MyDocument.o PreferencesWindowController.o doscript.o main.o install: Python\ Launcher.app diff --git a/Mac/README b/Mac/README index e4ff868237..da6a05fd86 100644 --- a/Mac/README +++ b/Mac/README @@ -5,13 +5,24 @@ MacOSX Notes This document provides a quick overview of some Mac OS X specific features in the Python distribution. -* ``--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 |