Skip to content

C
cpython
Commit a48b61f8 authored by Ned Deily's avatar Ned Deily
Browse files
Options

Issue #17161: make install now also installs a python3 man page.

parent 1273dfc3
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 5 deletions
Makefile.pre.in
View file @ a48b61f8
...@@ -830,10 +830,10 @@ memtest: all platform ...@@ -830,10 +830,10 @@ memtest: all platform
-$(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS) -$(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS)
$(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS) $(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS)
install: altinstall bininstall install: altinstall bininstall maninstall
altinstall: @FRAMEWORKALTINSTALLFIRST@ altbininstall libinstall inclinstall libainstall \ altinstall: @FRAMEWORKALTINSTALLFIRST@ altbininstall libinstall inclinstall libainstall \
sharedinstall oldsharedinstall maninstall @FRAMEWORKALTINSTALLLAST@ sharedinstall oldsharedinstall altmaninstall @FRAMEWORKALTINSTALLLAST@
# Install shared libraries enabled by Setup # Install shared libraries enabled by Setup
DESTDIRS= $(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED) DESTDIRS= $(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED)
...@@ -912,8 +912,8 @@ bininstall: altbininstall ...@@ -912,8 +912,8 @@ bininstall: altbininstall
-rm -f $(DESTDIR)$(BINDIR)/2to3 -rm -f $(DESTDIR)$(BINDIR)/2to3
(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
# Install the manual page # Install the versioned manual page
maninstall: altmaninstall:
@for i in $(MANDIR) $(MANDIR)/man1; \ @for i in $(MANDIR) $(MANDIR)/man1; \
do \ do \
if test ! -d $(DESTDIR)$$i; then \ if test ! -d $(DESTDIR)$$i; then \
...@@ -925,6 +925,11 @@ maninstall: ...@@ -925,6 +925,11 @@ maninstall:
$(INSTALL_DATA) $(srcdir)/Misc/python.man \ $(INSTALL_DATA) $(srcdir)/Misc/python.man \
$(DESTDIR)$(MANDIR)/man1/python$(VERSION).1 $(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 # Install the library
PLATDIR= plat-$(MACHDEP) PLATDIR= plat-$(MACHDEP)
EXTRAPLATDIR= @EXTRAPLATDIR@ EXTRAPLATDIR= @EXTRAPLATDIR@
...@@ -1360,7 +1365,7 @@ Python/thread.o: @THREADHEADERS@ ...@@ -1360,7 +1365,7 @@ Python/thread.o: @THREADHEADERS@
.PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure .PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure
.PHONY: frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools .PHONY: frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools
.PHONY: frameworkaltinstallunixtools recheck autoconf clean clobber distclean .PHONY: frameworkaltinstallunixtools recheck autoconf clean clobber distclean
.PHONY: smelly funny patchcheck .PHONY: smelly funny patchcheck altmaninstall
.PHONY: gdbhooks .PHONY: gdbhooks
# IF YOU PUT ANYTHING HERE IT WILL GO AWAY # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
......
Misc/NEWS
View file @ a48b61f8
...@@ -993,6 +993,8 @@ Build ...@@ -993,6 +993,8 @@ Build
Retina displays. Applies to Tkinter apps, such as IDLE, on OS X Retina displays. Applies to Tkinter apps, such as IDLE, on OS X
framework builds linked with Cocoa Tk 8.5. framework builds linked with Cocoa Tk 8.5.
- Issue #17161: make install now also installs a python3 man page.
Tools/Demos Tools/Demos
----------- -----------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7