Merge 3.1.

This commit is contained in:
Thomas Wouters 2011-03-06 11:51:24 -08:00
commit 6b1034392c
2 changed files with 4 additions and 2 deletions

View File

@ -1103,7 +1103,7 @@ sharedinstall: sharedmods
--prefix=$(prefix) \
--install-scripts=$(BINDIR) \
--install-platlib=$(DESTSHARED) \
--root=/$(DESTDIR)
--root=$(DESTDIR)/
# Here are a couple of targets for MacOSX again, to install a full
# framework-based Python. frameworkinstall installs everything, the
@ -1174,7 +1174,7 @@ scriptsinstall:
./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \
--prefix=$(prefix) \
--install-scripts=$(BINDIR) \
--root=/$(DESTDIR)
--root=$(DESTDIR)/
# Build the toplevel Makefile
Makefile.pre: Makefile.pre.in config.status

View File

@ -70,6 +70,8 @@ Library
Build
-----
- Issue #11411: Fix 'make DESTDIR=' with a relative destination.
- Issue #11268: Prevent Mac OS X Installer failure if Documentation
package had previously been installed.