diff options
| author | Ned Deily <nad@acm.org> | 2013-11-22 07:01:59 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2013-11-22 07:01:59 (GMT) |
| commit | 322f5ba0d8d5e8a9cd2a134fa215884b4cbc373d (patch) | |
| tree | e3d578e420a6d05bb5b8f1fc6a15292cc0c4f0f8 /Mac | |
| parent | b8f944f0b76ebfeecb181498868f10b273981668 (diff) | |
| download | cpython-322f5ba0d8d5e8a9cd2a134fa215884b4cbc373d.zip cpython-322f5ba0d8d5e8a9cd2a134fa215884b4cbc373d.tar.gz cpython-322f5ba0d8d5e8a9cd2a134fa215884b4cbc373d.tar.bz2 | |
Issue #19553: PEP 453 - "make install" and "make altinstall" now install or
upgrade pip by default, using the bundled pip provided by the new ensurepip
module. A new configure option, --with-ensurepip[=upgrade|install|no], is
available to override the default ensurepip "--upgrade" option. The option
can also be set with "make [alt]install ENSUREPIP=[upgrade|install\no]".
Diffstat (limited to 'Mac')
| -rw-r--r-- | Mac/Makefile.in | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/Mac/Makefile.in b/Mac/Makefile.in index c40ad1a..03ec738 100644 --- a/Mac/Makefile.in +++ b/Mac/Makefile.in @@ -5,6 +5,7 @@ VERSION=@VERSION@ ABIFLAGS=@ABIFLAGS@ LDVERSION=@LDVERSION@ +ENSUREPIP=@ENSUREPIP@ builddir = .. srcdir=@srcdir@ prefix=@prefix@ @@ -92,6 +93,16 @@ installunixtools: $(LN) -s $(BINDIR)/$${fn} $${fn} ;\ done ;\ fi + -if test "x$(ENSUREPIP)" != "xno" ; then \ + cd "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" && \ + for fn in \ + pip3 \ + ; \ + do \ + rm -f $${fn} ;\ + $(LN) -s $(BINDIR)/$${fn} $${fn} ;\ + done ;\ + fi # # Like installunixtools, but only install links to the versioned binaries. @@ -133,6 +144,17 @@ altinstallunixtools: $(LN) -s $(BINDIR)/$${fn} $${fn} ;\ done ;\ fi + -if test "x$(ENSUREPIP)" != "xno" ; then \ + cd "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" && \ + for fn in \ + easy_install-$(VERSION) \ + pip$(VERSION) \ + ; \ + do \ + rm -f $${fn} ;\ + $(LN) -s $(BINDIR)/$${fn} $${fn} ;\ + done ;\ + fi pythonw: $(srcdir)/Tools/pythonw.c Makefile $(CC) $(LDFLAGS) -DPYTHONFRAMEWORK='"$(PYTHONFRAMEWORK)"' -o $@ \ |