Skip to content

C
cpython
Commit a90459f6 authored by Thomas Wouters's avatar Thomas Wouters
Browse files
Options

Merge 3.1.

parents 0fdacfd0 df71d46a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
Makefile.pre.in
View file @ a90459f6
...@@ -1103,7 +1103,7 @@ sharedinstall: sharedmods ...@@ -1103,7 +1103,7 @@ sharedinstall: sharedmods
--prefix=$(prefix) \ --prefix=$(prefix) \
--install-scripts=$(BINDIR) \ --install-scripts=$(BINDIR) \
--install-platlib=$(DESTSHARED) \ --install-platlib=$(DESTSHARED) \
--root=/$(DESTDIR) --root=$(DESTDIR)/
# Here are a couple of targets for MacOSX again, to install a full # Here are a couple of targets for MacOSX again, to install a full
# framework-based Python. frameworkinstall installs everything, the # framework-based Python. frameworkinstall installs everything, the
...@@ -1174,7 +1174,7 @@ scriptsinstall: ...@@ -1174,7 +1174,7 @@ scriptsinstall:
./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \ ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \
--prefix=$(prefix) \ --prefix=$(prefix) \
--install-scripts=$(BINDIR) \ --install-scripts=$(BINDIR) \
--root=/$(DESTDIR) --root=$(DESTDIR)/
# Build the toplevel Makefile # Build the toplevel Makefile
Makefile.pre: Makefile.pre.in config.status Makefile.pre: Makefile.pre.in config.status
......
Misc/NEWS
View file @ a90459f6
...@@ -70,6 +70,8 @@ Library ...@@ -70,6 +70,8 @@ Library
Build Build
----- -----
- Issue #11411: Fix 'make DESTDIR=' with a relative destination.
- Issue #11268: Prevent Mac OS X Installer failure if Documentation - Issue #11268: Prevent Mac OS X Installer failure if Documentation
package had previously been installed. package had previously been installed.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7