Give in to Mike Meyer -- add *both* lib/python1.5/packages and

lib/site-python to the path (if they exist).  This is a reasonable
compromise.

diff --git a/Lib/site.py b/Lib/site.py
index 7c387f1446dabd4cd0f386ed86327f96752ad9b9..60a2208edc037dfd34ed48c8169a798492094e8b 100644 (file)
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -96,14 +96,16 @@ if sys.exec_prefix != sys.prefix:
 for prefix in prefixes:
     if prefix:
        if sys.platform[:3] in ('win', 'mac'):
-           sitedir = prefix
+           sitedirs = [prefix]
        else:
-           sitedir = os.path.join(prefix,
-                                  "lib",
-                                  "python" + sys.version[:3],
-                                  "packages")
-       if os.path.isdir(sitedir):
-           addsitedir(sitedir)
+           sitedirs = [os.path.join(prefix,
+                                    "lib",
+                                    "python" + sys.version[:3],
+                                    "packages"),
+                       os.path.join(prefix, "lib", "site-python")]
+       for sitedir in sitedirs:
+           if os.path.isdir(sitedir):
+               addsitedir(sitedir)
 
 try:
     import sitecustomize               # Run arbitrary site specific code