mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #17161: merge from 3.3

Browse source
This commit is contained in:
Ned Deily 2013-02-08 23:05:10 -08:00
commit 1ce9595e87
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Makefile.pre.in
View file

@ -886,10 +886,10 @@ quicktest: all platform
$(TESTRUNNER) $(QUICKTESTOPTS) $(TESTRUNNER) $(QUICKTESTOPTS)
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)
@ -970,8 +970,8 @@ bininstall: altbininstall
-rm -f $(DESTDIR)$(BINDIR)/pyvenv -rm -f $(DESTDIR)$(BINDIR)/pyvenv
(cd $(DESTDIR)$(BINDIR); $(LN) -s pyvenv-$(VERSION) pyvenv) (cd $(DESTDIR)$(BINDIR); $(LN) -s pyvenv-$(VERSION) pyvenv)
# 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 \
@ -983,6 +983,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@
@ -1455,7 +1460,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 touch .PHONY: smelly funny patchcheck touch altmaninstall
.PHONY: gdbhooks .PHONY: gdbhooks
# IF YOU PUT ANYTHING HERE IT WILL GO AWAY # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

2
Misc/NEWS
View file

@ -901,6 +901,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.
Documentation Documentation
------------- -------------