[Python-checkins] (2.7): Issue #11411: Fix typo in the Makefile that prevented 'make DESTDIR=' from

thomas.wouters python-checkins at python.org
Sun Mar 6 20:53:40 CET 2011


http://hg.python.org/cpython/rev/d121681ed1cc
changeset:   68305:d121681ed1cc
branch:      2.7
parent:      68303:9a4f471f51ec
user:        Thomas Wouters <thomas at python.org>
date:        Sun Mar 06 11:48:05 2011 -0800
summary:
  Issue #11411: Fix typo in the Makefile that prevented 'make DESTDIR=' from
working correctly with a relative path.

files:
  Makefile.pre.in
  Misc/NEWS

diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1059,7 +1059,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
@@ -1131,7 +1131,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
@@ -207,6 +207,8 @@
 Build
 -----
 
+- Issue #11411: Fix 'make DESTDIR=' with a relative destination.
+
 - Issue #10709: Add updated AIX notes in Misc/README.AIX.
 
 - Issue #11184: Fix large-file support on AIX.

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


More information about the Python-checkins mailing list