diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-05-26 21:18:59 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-05-26 21:18:59 (GMT) |
| commit | afbca49cbec2ac9fcecffc1d25b31e7afb8ae159 (patch) | |
| tree | 74e352ae123ce4e9e53734ff9e89ad1bc54e2301 /Mac | |
| parent | 220a9fbde44bb4d3d302a6ef8e1133b5209ec9f9 (diff) | |
| download | cpython-afbca49cbec2ac9fcecffc1d25b31e7afb8ae159.zip cpython-afbca49cbec2ac9fcecffc1d25b31e7afb8ae159.tar.gz cpython-afbca49cbec2ac9fcecffc1d25b31e7afb8ae159.tar.bz2 | |
* Adapt framework install makefiles to 2to3 tool
* Re-enable installation of files in /usr/local/bin in the OSX installer
because those files no longer clash with a 2.x install.
Diffstat (limited to 'Mac')
| -rwxr-xr-x | Mac/BuildScript/build-installer.py | 2 | ||||
| -rw-r--r-- | Mac/Makefile.in | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 3cd9d2d..d6a8618 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -225,7 +225,7 @@ PKG_RECIPES = [ is not necessary to use Python. """, required=False, - selected='unselected', + selected='selected', ), dict( name="PythonDocumentation", diff --git a/Mac/Makefile.in b/Mac/Makefile.in index 4d55e4b..7d88c4a 100644 --- a/Mac/Makefile.in +++ b/Mac/Makefile.in @@ -91,7 +91,8 @@ installunixtools: fi for fn in python3 pythonw3 idle3 pydoc3 python3-config \ python$(VERSION) pythonw$(VERSION) idle$(VERSION) \ - pydoc$(VERSION) python$(VERSION)-config ;\ + pydoc$(VERSION) python$(VERSION)-config 2to3 \ + 2to3-$(VERSION) ;\ do \ ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\ done @@ -109,7 +110,7 @@ altinstallunixtools: $(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ;\ fi for fn in python$(VERSION) pythonw$(VERSION) idle$(VERSION) \ - pydoc$(VERSION) python$(VERSION)-config ;\ + pydoc$(VERSION) python$(VERSION)-config 2to3-$(VERSION);\ do \ ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\ done @@ -130,6 +131,8 @@ install_versionedtools: mv "$(DESTDIR)$(prefix)/bin/$${fn}3" "$(DESTDIR)$(prefix)/bin/$${fn}$(VERSION)" ;\ ln -sf "$${fn}$(VERSION)" "$(DESTDIR)$(prefix)/bin/$${fn}3" ;\ done + mv "$(DESTDIR)$(prefix)/bin/2to3" "$(DESTDIR)$(prefix)/bin/2to3-$(VERSION)" + ln -sf "$(DESTDIR)$(prefix)/bin/2to3-$(VERSION)" "$(DESTDIR)$(prefix)/bin/2to3" if [ ! -h "$(DESTDIR)$(prefix)/bin/python3-config" ]; then \ mv "$(DESTDIR)$(prefix)/bin/python3-config" "$(DESTDIR)$(prefix)/bin/python$(VERSION)-config" ;\ ln -sf "python$(VERSION)-config" "$(DESTDIR)$(prefix)/bin/python3-config" ; \ |