diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-05-23 16:14:33 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-05-23 16:14:33 (GMT) |
| commit | 932073a1695454708fee8acba2fec2a6802d5421 (patch) | |
| tree | 78cc639ed9df1577efba061cc4ea496840c6dfb6 /Makefile.pre.in | |
| parent | 971e51be7e2ab1743ed73723596e2d9c15318491 (diff) | |
| download | cpython-932073a1695454708fee8acba2fec2a6802d5421.zip cpython-932073a1695454708fee8acba2fec2a6802d5421.tar.gz cpython-932073a1695454708fee8acba2fec2a6802d5421.tar.bz2 | |
remove the fullinstall target since py3k will always be known as python3 #6047
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 8371d84..50664b1 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -754,18 +754,8 @@ memtest: all platform -$(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS) $(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS) -# Install everything, and install Python 3 to "python" -fullinstall: @FRAMEWORKINSTALLFIRST@ altinstall bininstall @FRAMEWORKINSTALLLAST@ - -# "make install" is an alias for "make altinstall" since we don't want to -# overwrite Python 2.x by default. -install: altinstall - @echo "* Note: not installed as 'python'." - @echo "* Use 'make fullinstall' to install as 'python'." - @echo "* However, 'make fullinstall' is discouraged," - @echo "* as it will clobber your Python 2.x installation." - -# Install almost everything without disturbing 2.x versions +install: altinstall bininstall + altinstall: @FRAMEWORKALTINSTALLFIRST@ altbininstall libinstall inclinstall libainstall \ sharedinstall oldsharedinstall maninstall @FRAMEWORKALTINSTALLLAST@ @@ -790,20 +780,9 @@ $(DESTSHARED): fi; \ done - -# Install the interpreter (by creating a hard link to python$(VERSION)) -bininstall: altbininstall - -if test -f $(DESTDIR)$(BINDIR)/$(PYTHON)$(EXE) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON)$(EXE); \ - then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON)$(EXE); \ - else true; \ - fi - (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON)$(EXE)) - -rm -f $(DESTDIR)$(BINDIR)/python-config - (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python-config) - # Install the interpreter with $(VERSION) affixed # This goes into $(exec_prefix) -altbininstall: $(BUILDPYTHON) +altbininstall: $(BUILDPYTHON) @for i in $(BINDIR) $(LIBDIR); \ do \ if test ! -d $(DESTDIR)$$i; then \ @@ -824,6 +803,8 @@ altbininstall: $(BUILDPYTHON) fi; \ else true; \ fi + +bininstall: altbininstall -if test -f $(DESTDIR)$(BINDIR)/$(PYTHON)3$(EXE) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON)3$(EXE); \ then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON)3$(EXE); \ else true; \ |