diff options
| author | Ned Deily <nad@acm.org> | 2013-02-09 07:05:10 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2013-02-09 07:05:10 (GMT) |
| commit | 1ce9595e87b70e0d72815d1c5dd17c9a000c8df5 (patch) | |
| tree | dfaa32db770fda14ebdc7d99580522f04ce9deec | |
| parent | d1938cdc16c9aacadc9bfaf15aaf423744519df0 (diff) | |
| parent | aa20b000d197aef58bd7d4e31af39433983ed036 (diff) | |
| download | cpython-1ce9595e87b70e0d72815d1c5dd17c9a000c8df5.zip cpython-1ce9595e87b70e0d72815d1c5dd17c9a000c8df5.tar.gz cpython-1ce9595e87b70e0d72815d1c5dd17c9a000c8df5.tar.bz2 | |
Issue #17161: merge from 3.3
| -rw-r--r-- | Makefile.pre.in | 15 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 12 insertions, 5 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index f8d5674..ce73b4c 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@ @@ -1455,7 +1460,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 @@ -901,6 +901,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. + Documentation ------------- |