[Python-checkins] cpython (3.2): Issue #17161: make install now also installs a python3 man page.

Sat Feb 9 08:05:59 CET 2013

http://hg.python.org/cpython/rev/b0d9b273c029
changeset: 82073:b0d9b273c029
branch: 3.2
parent: 82069:83bf8191e4d1
user: Ned Deily <nad at acm.org>
date: Fri Feb 08 22:53:51 2013 -0800
summary:
 Issue #17161: make install now also installs a python3 man page.
files:
 Makefile.pre.in | 15 ++++++++++-----
 Misc/NEWS | 2 ++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -830,10 +830,10 @@
 		-$(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS)
 		$(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS)
 
-install: altinstall bininstall
+install: altinstall bininstall maninstall
 
 altinstall:	@FRAMEWORKALTINSTALLFIRST@ altbininstall libinstall inclinstall libainstall \
- sharedinstall oldsharedinstall maninstall @FRAMEWORKALTINSTALLLAST@
+ sharedinstall oldsharedinstall altmaninstall @FRAMEWORKALTINSTALLLAST@
 
 # Install shared libraries enabled by Setup
 DESTDIRS=	$(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED)
@@ -912,8 +912,8 @@
 	-rm -f $(DESTDIR)$(BINDIR)/2to3
 	(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
 
-# Install the manual page
-maninstall:
+# Install the versioned manual page
+altmaninstall:
 	@for i in $(MANDIR) $(MANDIR)/man1; \
 	do \
 		if test ! -d $(DESTDIR)$$i; then \
@@ -925,6 +925,11 @@
 	$(INSTALL_DATA) $(srcdir)/Misc/python.man \
 		$(DESTDIR)$(MANDIR)/man1/python$(VERSION).1
 
+# Install the unversioned manual page
+maninstall:	altmaninstall
+	-rm -f $(DESTDIR)$(MANDIR)/man1/python3.1
+	(cd $(DESTDIR)$(MANDIR)/man1; $(LN) -s python$(VERSION).1 python3.1)
+
 # Install the library
 PLATDIR=	plat-$(MACHDEP)
 EXTRAPLATDIR= @EXTRAPLATDIR@
@@ -1360,7 +1365,7 @@
 .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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -993,6 +993,8 @@
 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 python3 man page.
+
 Tools/Demos
 -----------
 
-- 
Repository URL: http://hg.python.org/cpython
