[Python-checkins] cpython (2.7): Issue #17161: make install now also installs a python2 and python man page.
ned.deily
python-checkins at python.org
Sat Feb 9 08:05:57 CET 2013
http://hg.python.org/cpython/rev/29826cb3f12e
changeset: 82072:29826cb3f12e
branch: 2.7
parent: 82068:532c59c52cb3
user: Ned Deily <nad at acm.org>
date: Fri Feb 08 22:51:52 2013 -0800
summary:
Issue #17161: make install now also installs a python2 and python man page.
files:
Makefile.pre.in | 16 ++++++++++++----
Misc/NEWS | 2 ++
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -806,7 +806,8 @@
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 @@
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 @@
$(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 @@
.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
@@ -830,6 +830,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 python2 and python man page.
+
Tools/Demos
-----------
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list