projects / packages / python3.git / blame
| Commit | Line | Data |
|---|---|---|
| 4212268e JK |
1 | diff -dur -x '*~' -x '*.orig' Python-3.5.0.orig/Lib/distutils/command/install.py Python-3.5.0/Lib/distutils/command/install.py |
| 2 | --- Python-3.5.0.orig/Lib/distutils/command/install.py 2015-11-25 17:54:32.000000000 +0100 | |
| 3 | +++ Python-3.5.0/Lib/distutils/command/install.py 2015-11-25 18:06:33.876268151 +0100 | |
| 4 | @@ -9,6 +9,7 @@ | |
| 5 | from distutils.core import Command | |
| 6 | from distutils.debug import DEBUG | |
| 7 | from distutils.sysconfig import get_config_vars | |
| 8 | +from distutils.sysconfig import PREFIX, EXEC_PREFIX | |
| 9 | from distutils.errors import DistutilsPlatformError | |
| 10 | from distutils.file_util import write_file | |
| 11 | from distutils.util import convert_path, subst_vars, change_root | |
| 12 | @@ -418,8 +419,8 @@ | |
| 13 | raise DistutilsOptionError( | |
| 14 | "must not supply exec-prefix without prefix") | |
| 15 | ||
| 16 | - self.prefix = os.path.normpath(sys.prefix) | |
| 17 | - self.exec_prefix = os.path.normpath(sys.exec_prefix) | |
| 18 | + self.prefix = PREFIX | |
| 19 | + self.exec_prefix = EXEC_PREFIX | |
| 20 | ||
| 21 | else: | |
| 22 | if self.exec_prefix is None: | |
| 23 | diff -dur -x '*~' -x '*.orig' Python-3.5.0.orig/Lib/distutils/sysconfig.py Python-3.5.0/Lib/distutils/sysconfig.py | |
| 24 | --- Python-3.5.0.orig/Lib/distutils/sysconfig.py 2015-11-25 17:54:32.000000000 +0100 | |
| 25 | +++ Python-3.5.0/Lib/distutils/sysconfig.py 2015-11-25 18:03:39.338573134 +0100 | |
| 595077ba | 26 | @@ -17,8 +17,12 @@ |
| 4212268e JK |
27 | from .errors import DistutilsPlatformError |
| 28 | ||
| 29 | # These are needed in a couple of spots, so just compute them once. | |
| 595077ba JK |
30 | PREFIX = os.path.normpath(sys.prefix) |
| 31 | EXEC_PREFIX = os.path.normpath(sys.exec_prefix) | |
| 32 | +if PREFIX == "/usr": | |
| 33 | + PREFIX = "/usr/local" | |
| 34 | +if EXEC_PREFIX == "/usr": | |
| 35 | + EXEC_PREFIX = "/usr/local" | |
| 4212268e JK |
36 | BASE_PREFIX = os.path.normpath(sys.base_prefix) |
| 37 | BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix) | |
| 38 | ||
| 39 | diff -dur -x '*~' -x '*.orig' Python-3.5.0.orig/Lib/site.py Python-3.5.0/Lib/site.py | |
| 40 | --- Python-3.5.0.orig/Lib/site.py 2015-11-25 17:54:32.000000000 +0100 | |
| 41 | +++ Python-3.5.0/Lib/site.py 2015-11-25 17:56:39.979513073 +0100 | |
| 42 | @@ -74,7 +74,7 @@ | |
| 43 | import _sitebuiltins | |
| 44 | ||
| 45 | # Prefixes for site-packages; add additional prefixes like /usr/local here | |
| 46 | -PREFIXES = [sys.prefix, sys.exec_prefix] | |
| 47 | +PREFIXES = ["/usr/local", sys.prefix, sys.exec_prefix] | |
| 48 | # Enable per user site-packages directory | |
| 49 | # set it to False to disable the feature or True to force the feature | |
| 50 | ENABLE_USER_SITE = None |