[Python-checkins] r72857 - in python/branches/py3k: Makefile.pre.in Misc/NEWS README

Sat May 23 18:14:33 CEST 2009

Author: benjamin.peterson
Date: Sat May 23 18:14:33 2009
New Revision: 72857
Log:
remove the fullinstall target since py3k will always be known as python3 #6047
Modified:
 python/branches/py3k/Makefile.pre.in
 python/branches/py3k/Misc/NEWS
 python/branches/py3k/README
Modified: python/branches/py3k/Makefile.pre.in
==============================================================================

--- python/branches/py3k/Makefile.pre.in	(original)
+++ python/branches/py3k/Makefile.pre.in	Sat May 23 18:14:33 2009
@@ -754,18 +754,8 @@
 		-$(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS)
 		$(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS)
 
-# Install everything, and install Python 3 to "python"
-fullinstall:	@FRAMEWORKINSTALLFIRST@ altinstall bininstall @FRAMEWORKINSTALLLAST@
+install: altinstall bininstall
 
-# "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
 altinstall:	@FRAMEWORKALTINSTALLFIRST@ altbininstall libinstall inclinstall libainstall \
 sharedinstall oldsharedinstall maninstall @FRAMEWORKALTINSTALLLAST@
 
@@ -790,20 +780,9 @@
 			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 @@
 		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; \
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sat May 23 18:14:33 2009
@@ -60,6 +60,11 @@
 - 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
 -----------------
Modified: python/branches/py3k/README
==============================================================================
--- python/branches/py3k/README	(original)
+++ python/branches/py3k/README	Sat May 23 18:14:33 2009
@@ -119,7 +119,7 @@
 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 @@
 ./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
