remove the fullinstall target since py3k will always be known as python3 #6047

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 8371d846f5ebe154df3d6f3434a75ff202f89967..50664b13e6485c5b660128298748d860b64a5192 100644 (file)
--- 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; \

diff --git a/Misc/NEWS b/Misc/NEWS
index 6d5769376883eefa3d81be6d4698db84f4b0ca78..85245fa0df3bac12586d6da16ead0f2b0361685b 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -60,6 +60,11 @@ Library
 - Issue 5955: aifc's close method did not close the file it wrapped,
   now it does.  This also means getfp method now returns the real fp.
 
+Installation
+------------
+
+- Issue #6047: fullinstall has been removed because Python 3's executable will
+  now be known as python3.
 
 Extension Modules
 -----------------

diff --git a/README b/README
index 6263ee25fb82476fee8c8c09e7524c271fcd74d8..558e10deaee825996b3cc274e77859c5c93690b8 100644 (file)
--- a/README
+++ b/README
@@ -119,7 +119,7 @@ script) you must take care that your primary python executable is not
 overwritten by the installation of a different versio.  All files and
 directories installed using "make altinstall" contain the major and minor
 version and can thus live side-by-side.  "make install" also creates
-${prefix}/bin/python which refers to ${prefix}/bin/pythonX.Y.  If you intend
+${prefix}/bin/python3 which refers to ${prefix}/bin/pythonX.Y.  If you intend
 to install multiple versions using the same prefix you must decide which
 version (if any) is your "primary" version.  Install that version using
 "make install".  Install all other versions using "make altinstall".
@@ -167,7 +167,7 @@ On Unix, Linux, BSD, OSX, and Cygwin:
     ./configure
     make
     make test
-    sudo make install    # or "make altinstall"
+    sudo make install
 
 You can pass many options to the configure script; run "./configure
 --help" to find out more.  On OSX and Cygwin, the executable is called