diff options
| author | Ned Deily <nad@acm.org> | 2013-02-09 06:51:52 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2013-02-09 06:51:52 (GMT) |
| commit | ed1e4382c48a3788e5ce71e8c28b4b82ba1bcda2 (patch) | |
| tree | 5e715a63e68057762c63d316226deb79585980d9 | |
| parent | c12dcd2e4dae4a759c52921d6eae86bd7e0a4e9e (diff) | |
| download | cpython-ed1e4382c48a3788e5ce71e8c28b4b82ba1bcda2.zip cpython-ed1e4382c48a3788e5ce71e8c28b4b82ba1bcda2.tar.gz cpython-ed1e4382c48a3788e5ce71e8c28b4b82ba1bcda2.tar.bz2 | |
Issue #17161: make install now also installs a python2 and python man page.
| -rw-r--r-- | Makefile.pre.in | 16 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 14 insertions, 4 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index bd314ba..dc3c9c3 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -806,7 +806,8 @@ memtest: all platform 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 @@ altbininstall: $(BUILDPYTHON) 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 @@ maninstall: $(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 @@ Python/thread.o: @THREADHEADERS@ .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 @@ -830,6 +830,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 python2 and python man page. + Tools/Demos ----------- |