summaryrefslogtreecommitdiffstats
path: root/Makefile.pre.in
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2008-04-07 18:37:41 (GMT)
committerGuido van Rossum <guido@python.org>2008-04-07 18:37:41 (GMT)
commitdc21db36cb481a192cc259b21e80e8d84f45f5d3 (patch)
treed19c3c4ee31709f6102565109b92e4da4147985d /Makefile.pre.in
parentfac49f6e6d7e8088966a4182243a56de88135e01 (diff)
downloadcpython-dc21db36cb481a192cc259b21e80e8d84f45f5d3.zip
cpython-dc21db36cb481a192cc259b21e80e8d84f45f5d3.tar.gz
cpython-dc21db36cb481a192cc259b21e80e8d84f45f5d3.tar.bz2
"make install" is now an alias for "make altinstall", to prevent
accidentally overwriting a Python 2.x installation. Use "make fullinstall" to force Python 3.0 to be installed as "python".
Diffstat (limited to 'Makefile.pre.in')
-rw-r--r--Makefile.pre.in10
1 files changed, 9 insertions, 1 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index f9b59e9..c21658d 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -687,7 +687,15 @@ memtest: all platform
$(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS)
# Install everything
-install: @FRAMEWORKINSTALLFIRST@ altinstall bininstall maninstall @FRAMEWORKINSTALLLAST@
+fullinstall: @FRAMEWORKINSTALLFIRST@ altinstall bininstall maninstall @FRAMEWORKINSTALLLAST@
+
+# "make install" is an alias for "make altinstall" since we never want to
+# overwrite Python 2.x.
+install: altinstall
+ echo "* Note: not installed as 'python'."
+ echo "* Use 'make fullinstall' to install as 'python'."
+ echo "* However, 'make fulinstall' is discouraged,"
+ echo "* as it will clobber your Python 2.x installation."
# Install almost everything without disturbing previous versions
altinstall: @FRAMEWORKALTINSTALLFIRST@ altbininstall libinstall inclinstall libainstall \