Commit 42900941 authored by Greg Ward's avatar Greg Ward

Include the Python version in the platform-specific build directories:

with the recent change in 'get_platform()', we now have directory names
like "build/lib-1.5-linux-i586".  Idea and original patch by
Rene Liebscher.
parent 9ae7c3c9
...@@ -67,6 +67,8 @@ class build (Command): ...@@ -67,6 +67,8 @@ class build (Command):
# hardware architecture! # hardware architecture!
self.plat = get_platform () self.plat = get_platform ()
plat_specifier = sys.version[0:3] + '-' + self.plat
# 'build_purelib' and 'build_platlib' just default to 'lib' and # 'build_purelib' and 'build_platlib' just default to 'lib' and
# 'lib.<plat>' under the base build directory. We only use one of # 'lib.<plat>' under the base build directory. We only use one of
# them for a given distribution, though -- # them for a given distribution, though --
...@@ -74,7 +76,7 @@ class build (Command): ...@@ -74,7 +76,7 @@ class build (Command):
self.build_purelib = os.path.join (self.build_base, 'lib') self.build_purelib = os.path.join (self.build_base, 'lib')
if self.build_platlib is None: if self.build_platlib is None:
self.build_platlib = os.path.join (self.build_base, self.build_platlib = os.path.join (self.build_base,
'lib.' + self.plat) 'lib-' + plat_specifier)
# 'build_lib' is the actual directory that we will use for this # 'build_lib' is the actual directory that we will use for this
# particular module distribution -- if user didn't supply it, pick # particular module distribution -- if user didn't supply it, pick
...@@ -89,7 +91,7 @@ class build (Command): ...@@ -89,7 +91,7 @@ class build (Command):
# "build/temp.<plat>" # "build/temp.<plat>"
if self.build_temp is None: if self.build_temp is None:
self.build_temp = os.path.join (self.build_base, self.build_temp = os.path.join (self.build_base,
'temp.' + self.plat) 'temp-' + plat_specifier)
if self.build_scripts is None: if self.build_scripts is None:
self.build_scripts = os.path.join (self.build_base, 'scripts') self.build_scripts = os.path.join (self.build_base, 'scripts')
# finalize_options () # finalize_options ()
......
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