Issue #17161: make install now also installs a python2 and python man page.

diff --git a/Makefile.pre.in b/Makefile.pre.in
index bd314ba806836a2370b8c3e25a79086e71910d4d..dc3c9c329dd843f4854c32ddfa569250fc2b165f 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -806,7 +806,8 @@ memtest:    all platform
 install:       @FRAMEWORKINSTALLFIRST@ altinstall bininstall maninstall @FRAMEWORKINSTALLLAST@
 
 # Install almost everything without disturbing previous versions
-altinstall:    @FRAMEWORKALTINSTALLFIRST@ altbininstall libinstall inclinstall libainstall \
+altinstall:    @FRAMEWORKALTINSTALLFIRST@ altbininstall libinstall inclinstall \
+                               libainstall altmaninstall \
                 sharedinstall oldsharedinstall @FRAMEWORKALTINSTALLLAST@
 
 # Install shared libraries enabled by Setup
@@ -876,8 +877,8 @@ altbininstall:      $(BUILDPYTHON)
        else    true; \
        fi
 
-# Install the manual page
-maninstall:
+# Install the versioned manual page
+altmaninstall:
        @for i in $(MANDIR) $(MANDIR)/man1; \
        do \
                if test ! -d $(DESTDIR)$$i; then \
@@ -889,6 +890,13 @@ maninstall:
        $(INSTALL_DATA) $(srcdir)/Misc/python.man \
                $(DESTDIR)$(MANDIR)/man1/python$(VERSION).1
 
+# Install the unversioned manual pages
+maninstall:    altmaninstall
+       -rm -f $(DESTDIR)$(MANDIR)/man1/python2.1
+       (cd $(DESTDIR)$(MANDIR)/man1; $(LN) -s python$(VERSION).1 python2.1)
+       -rm -f $(DESTDIR)$(MANDIR)/man1/python.1
+       (cd $(DESTDIR)$(MANDIR)/man1; $(LN) -s python2.1 python.1)
+
 # Install the library
 PLATDIR=       plat-$(MACHDEP)
 EXTRAPLATDIR= @EXTRAPLATDIR@
@@ -1326,7 +1334,7 @@ Python/thread.o: @THREADHEADERS@
 .PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure
 .PHONY: frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools
 .PHONY: frameworkaltinstallunixtools recheck autoconf clean clobber distclean 
-.PHONY: smelly funny patchcheck
+.PHONY: smelly funny patchcheck altmaninstall
 .PHONY: gdbhooks
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/Misc/NEWS b/Misc/NEWS
index 5da61c0cad35067e9f03763b588094356118a1c2..dde2126b0c4d30d3dc1c10295005c5ba57fabe21 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -830,6 +830,8 @@ Build
   Retina displays.  Applies to Tkinter apps, such as IDLE, on OS X
   framework builds linked with Cocoa Tk 8.5.
 
+- Issue #17161: make install now also installs a python2 and python man page.
+
 Tools/Demos
 -----------