diff options
| author | Thomas Wouters <thomas@python.org> | 2011-03-06 19:51:24 (GMT) |
|---|---|---|
| committer | Thomas Wouters <thomas@python.org> | 2011-03-06 19:51:24 (GMT) |
| commit | 6b1034392ca044c282879fc9c3f552c62e90b566 (patch) | |
| tree | aafdbcaceda73772780ec03d863725adf8551c45 | |
| parent | bb3e937a18edcc6f558d9085439ec76501aad619 (diff) | |
| parent | 81638f1351780eccb70bbc701ce366861a914d2e (diff) | |
| download | cpython-6b1034392ca044c282879fc9c3f552c62e90b566.zip cpython-6b1034392ca044c282879fc9c3f552c62e90b566.tar.gz cpython-6b1034392ca044c282879fc9c3f552c62e90b566.tar.bz2 | |
Merge 3.1.
| -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 d665939..0712893 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -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 @@ -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. |