Merged revisions 65667 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65667 | hirokazu.yamamoto | 2008-08-14 14:50:43 +0900 | 1 line

  Fixed test_distutils error (test_build_ext) on VC6.
........

diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
index 2db53f134d03dd6bf6dc7112d4e92bb4097cf62a..7ef5becc6f44723847c15b43a39317852c2eef96 100644 (file)
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
@@ -205,9 +205,12 @@ class build_ext(Command):
             elif MSVC_VERSION == 8:
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
                                          'PC', 'VS8.0', 'win32release'))
-            else:
+            elif MSVC_VERSION == 7:
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
                                          'PC', 'VS7.1'))
+            else:
+                self.library_dirs.append(os.path.join(sys.exec_prefix,
+                                         'PC', 'VC6'))
 
         # OS/2 (EMX) doesn't support Debug vs Release builds, but has the
         # import libraries in its "Config" subdirectory