Merge 3.2.

This commit is contained in:
Thomas Wouters 2011-03-06 11:52:15 -08:00
commit 63bd5f9fe3
2 changed files with 4 additions and 2 deletions

View file

@ -1101,7 +1101,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
@ -1172,7 +1172,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

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