diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2006-06-06 19:50:24 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2006-06-06 19:50:24 (GMT) |
| commit | 5b78732a20b1e8210cbc3bad7067e52fb969007f (patch) | |
| tree | 6bf65b7ec378cea8a8dac763a6323495cb6c9b8f /Mac | |
| parent | b1998bc860169c02a23fce874f538cf009d351de (diff) | |
| download | cpython-5b78732a20b1e8210cbc3bad7067e52fb969007f.zip cpython-5b78732a20b1e8210cbc3bad7067e52fb969007f.tar.gz cpython-5b78732a20b1e8210cbc3bad7067e52fb969007f.tar.bz2 | |
* Ensure that "make altinstall" works when the tree was configured
with --enable-framework
* Also for --enable-framework: allow users to use --prefix to specify
the location of the compatibility symlinks (such as /usr/local/bin/python)
Diffstat (limited to 'Mac')
| -rw-r--r-- | Mac/OSX/Makefile.in | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/Mac/OSX/Makefile.in b/Mac/OSX/Makefile.in index ecb4399..d0e39e4 100644 --- a/Mac/OSX/Makefile.in +++ b/Mac/OSX/Makefile.in @@ -10,6 +10,7 @@ LIBDEST=$(prefix)/lib/python$(VERSION) BUILDPYTHON=$(builddir)/python.exe DESTDIR= LDFLAGS= @LDFLAGS@ +FRAMEWORKUNIXTOOLSPREFIX=@FRAMEWORKUNIXTOOLSPREFIX@ # These are normally glimpsed from the previous set bindir=@exec_prefix@/bin @@ -59,14 +60,30 @@ install_pythonw: pythonw # actual installation inside the framework. # installunixtools: - if [ ! -d "$(DESTDIR)/usr/local/bin" ]; then \ - $(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)/usr/local/bin" ;\ + if [ ! -d "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ]; then \ + $(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ;\ fi - for fn in `ls "$(DESTDIR)$(prefix)/bin/"` ; \ + for fn in python pythonw idle pydoc python-config smtpd.py \ + python$(VERSION) pythonw$(VERSION) idle$(VERSION) \ + pydoc$(VERSION) python-config$(VERSION) smtpd$(VERSION).py ;\ do \ - ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)/usr/local/bin/$${fn}" ;\ + ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\ done +# +# Like installunixtools, but only install links to the versioned binaries. +# +altinstallunixtools: + if [ ! -d "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ]; then \ + $(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ;\ + fi + for fn in python$(VERSION) pythonw$(VERSION) idle$(VERSION) \ + pydoc$(VERSION) python-config$(VERSION) smtpd$(VERSION).py ;\ + do \ + ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\ + done + + # By default most tools are installed without a version in their basename, to # make it easier to install (and use) several python versions side-by-side move # the tools to a version-specific name and add the non-versioned name as an @@ -215,7 +232,7 @@ installmacsubtree: # # We use the full name here in stead of $(INSTALLED_PYTHONAPP), because # the latter may be overridden by Makefile.jaguar when building for a pre-installed -$(INSTALLED_PYTHONAPP)/Contents/MacOS/Python: install_Python +$(APPINSTALLDIR)/Contents/MacOS/Python: install_Python # $(INSTALLED_PYTHON) has to be done by the main Makefile, we cannot do that here. # At least this rule will give an error if it doesn't exist. |