diff options
| author | Thomas Wouters <thomas@python.org> | 2011-03-06 19:52:15 (GMT) |
|---|---|---|
| committer | Thomas Wouters <thomas@python.org> | 2011-03-06 19:52:15 (GMT) |
| commit | 63bd5f9fe32d54057ac7e96bf00fef22ecbf92c4 (patch) | |
| tree | e29b8b2bd338910e851117881cc6d10f6e546d6d | |
| parent | 5fd4bd3796a220932c6148de2d08589a7f1b93d6 (diff) | |
| parent | 6b1034392ca044c282879fc9c3f552c62e90b566 (diff) | |
| download | cpython-63bd5f9fe32d54057ac7e96bf00fef22ecbf92c4.zip cpython-63bd5f9fe32d54057ac7e96bf00fef22ecbf92c4.tar.gz cpython-63bd5f9fe32d54057ac7e96bf00fef22ecbf92c4.tar.bz2 | |
Merge 3.2.
| -rw-r--r-- | Makefile.pre.in | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 3312c6f..8d7f5ad 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -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 @@ -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. |