summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2004-05-11 18:13:10 (GMT)
committerTim Peters <tim.peters@gmail.com>2004-05-11 18:13:10 (GMT)
commit926bc22c65c6bba4e62b0b2b0969e0c7aaae12cd (patch)
tree7476eb7fc0733ab0a75ccf6de4b402ad42ef68fc
parent5b44cd64d7a05b2f31c927e2b784789a8094a270 (diff)
downloadcpython-926bc22c65c6bba4e62b0b2b0969e0c7aaae12cd.zip
cpython-926bc22c65c6bba4e62b0b2b0969e0c7aaae12cd.tar.gz
cpython-926bc22c65c6bba4e62b0b2b0969e0c7aaae12cd.tar.bz2
Added 2.3.3 and 2.3.4 to the release table. Added 2004 to the list of
copyright years.
-rw-r--r--LICENSE8
-rw-r--r--Lib/distutils/command/build_ext.py7
2 files changed, 9 insertions, 6 deletions
diff --git a/LICENSE b/LICENSE
index 7dc5c4e..e637557 100644
--- a/LICENSE
+++ b/LICENSE
@@ -45,6 +45,8 @@ the various releases.
2.3 2.2.2 2002-2003 PSF yes
2.3.1 2.3 2002-2003 PSF yes
2.3.2 2.3.1 2002-2003 PSF yes
+ 2.3.3 2.3.2 2002-2003 PSF yes
+ 2.3.4 2.3.3 2004 PSF yes
Footnotes:
@@ -80,9 +82,9 @@ license to reproduce, analyze, test, perform and/or display publicly,
prepare derivative works, distribute, and otherwise use Python 2.3
alone or in any derivative version, provided, however, that PSF's
License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
-2001, 2002, 2003 Python Software Foundation; All Rights Reserved" are
-retained in Python 2.3 alone or in any derivative version prepared by
-Licensee.
+2001, 2002, 2003, 2004 Python Software Foundation; All Rights Reserved"
+are retained in Python 2.3 alone or in any derivative version prepared
+by Licensee.
3. In the event Licensee prepares a derivative work that is based on
or incorporates Python 2.3 or any part thereof, and wants to make
diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
index 0c37768..83364c7 100644
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
@@ -171,9 +171,10 @@ class build_ext (Command):
# Append the source distribution include and library directories,
# this allows distutils on windows to work in the source tree
self.include_dirs.append(os.path.join(sys.exec_prefix, 'PC'))
- self.library_dirs.append(os.path.join(sys.exec_prefix, 'PCBuild'))
+ self.library_dirs.append(os.path.join(sys.exec_prefix, 'PC', 'VC6'))
+ #self.library_dirs.append(os.path.join(sys.exec_prefix, 'PCBuild'))
- # OS/2 (EMX) doesn't support Debug vs Release builds, but has the
+ # OS/2 (EMX) doesn't support Debug vs Release builds, but has the
# import libraries in its "Config" subdirectory
if os.name == 'os2':
self.library_dirs.append(os.path.join(sys.exec_prefix, 'Config'))
@@ -636,7 +637,7 @@ class build_ext (Command):
# EMX/GCC requires the python library explicitly, and I
# believe VACPP does as well (though not confirmed) - AIM Apr01
template = "python%d%d"
- # debug versions of the main DLL aren't supported, at least
+ # debug versions of the main DLL aren't supported, at least
# not at this time - AIM Apr01
#if self.debug:
# template = template + '_d'