[Python-checkins] (merge 3.1 -> 3.2): Merge 3.1.

[thomas.wouters]

http://hg.python.org/cpython/rev/686df11f0a14
changeset:   68307:686df11f0a14
branch:      3.2
parent:      68301:9040278551da
parent:      68306:12f0da000dc4
user:        Thomas Wouters <thomas at python.org>
date:        Sun Mar 06 11:51:24 2011 -0800
summary:
  Merge 3.1.

files:
  Makefile.pre.in
  Misc/NEWS

diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1103,7 +1103,7 @@
 	   	--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 @@
 	./$(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
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -70,6 +70,8 @@
 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.
 

-- 
Repository URL: http://hg.python.org/cpython