summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.pre.in15
-rw-r--r--Misc/NEWS2
2 files changed, 12 insertions, 5 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 716de12..233d201 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -886,10 +886,10 @@ quicktest: all platform
$(TESTRUNNER) $(QUICKTESTOPTS)
-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)
@@ -970,8 +970,8 @@ bininstall: altbininstall
-rm -f $(DESTDIR)$(BINDIR)/pyvenv
(cd $(DESTDIR)$(BINDIR); $(LN) -s pyvenv-$(VERSION) pyvenv)
-# Install the manual page
-maninstall:
+# Install the versioned manual page
+altmaninstall:
@for i in $(MANDIR) $(MANDIR)/man1; \
do \
if test ! -d $(DESTDIR)$$i; then \
@@ -983,6 +983,11 @@ maninstall:
$(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@
@@ -1452,7 +1457,7 @@ Python/thread.o: @THREADHEADERS@
.PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure
.PHONY: frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools
.PHONY: frameworkaltinstallunixtools recheck autoconf clean clobber distclean
-.PHONY: smelly funny patchcheck touch
+.PHONY: smelly funny patchcheck touch altmaninstall
.PHONY: gdbhooks
# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/Misc/NEWS b/Misc/NEWS
index 080533a..8c8b388 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -663,6 +663,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 python3 man page.
+
Tools/Demos
-----------