4 files changed, 18 insertions, 10 deletions

diff --git a/misc/Makefile.in b/misc/Makefile.in
index f6d919f6b..826c84c18 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -57,11 +57,13 @@ SETUPCMD=	setup.py --quiet install $(SETUPINSTOPTS)
 
 EMAIL=		email-4.0.1
 SETUPTOOLS=	setuptools-0.6c3
-SETUPPKGS=	$(EMAIL) $(SETUPTOOLS)
+PYSQLITE=	pysqlite-2.3.2
+SQLALCHEMY=	SQLAlchemy-0.3.0
+SETUPPKGS=	$(EMAIL) $(SETUPTOOLS) $(PYSQLITE) $(SQLALCHEMY)
 
 EZINSTOPTS=	--install-dir $(DESTDIR)$(PYTHONLIBDIR)
 EZCMD=		$(PYTHONLIBDIR)/$(SETUPTOOLS)-py2.4.egg/easy_install.py \
-		$(EZINSTALLOPTS)
+		$(EZINSTOPTS)
 
 WSGIREF=	wsgiref-0.1.2-py2.4.egg
 EZPKGS=		$(WSGIREF)
diff --git a/misc/SQLAlchemy-0.3.0.tar.gz b/misc/SQLAlchemy-0.3.0.tar.gz
new file mode 100644
index 000000000..46f327bf2
--- /dev/null
+++ b/misc/SQLAlchemy-0.3.0.tar.gz
diff --git a/misc/paths.py.in b/misc/paths.py.in
index 0d36948fb..cc1e50fa4 100644
--- a/misc/paths.py.in
+++ b/misc/paths.py.in
@@ -24,8 +24,9 @@
 # attributes that other modules may use to get the absolute path to the
 # installed Mailman distribution.
 
-import sys
 import os
+import sys
+import site
 
 # some scripts expect this attribute to be in this module
 prefix = '@prefix@'
@@ -39,16 +40,21 @@ if exec_prefix == '${prefix}':
 # directory.
 sys.path.insert(0, prefix)
 
-# We also need the pythonlib directory on the path to pick up any overrides of
-# standard modules and packages.  Note that these must go at the front of the
-# path for this reason.
-sys.path.insert(0, os.path.join(prefix, 'pythonlib'))
+# Add Python's site-packages for system add-ons.  Then add our pythonlib
+# directory on path to pick up any overrides of the standard modules and
+# packages.  In both cases, process any .pth files found in either location.
+# Order here matters: our pythonlib directory goes at the front while the
+# system site-packages goes at the end.
+sitedir     = os.path.join(sys.prefix, 'lib', 'python'+sys.version[:3],
+                           'site-packages')
+pythonlib   = os.path.join(prefix, 'pythonlib')
 
-# Include Python's site-packages directory.
-sitedir = os.path.join(sys.prefix, 'lib', 'python'+sys.version[:3],
-                       'site-packages')
+sys.path.insert(0, pythonlib)
 sys.path.append(sitedir)
 
+site.addsitedir(pythonlib)
+site.addsitedir(sitedir)
+
 # Arabic and Hebrew (RFC-1556) encoding aliases. (temporary solution)
 import encodings.aliases
 encodings.aliases.aliases.update({
diff --git a/misc/pysqlite-2.3.2.tar.gz b/misc/pysqlite-2.3.2.tar.gz
new file mode 100644
index 000000000..52f5711e9
--- /dev/null
+++ b/misc/pysqlite-2.3.2.tar.gz