aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2008-12-02 14:00:39 -0800
committerMark Sapiro <mark@msapiro.net>2008-12-02 14:00:39 -0800
commit9fc928ea049f04810ab9b3d1eaabd162abdefe1d (patch)
tree469f641fe59ccd4394c77e433f2966482a961940
parent2da8819928e6b010eb6c9d34c71a4f9f0287af9b (diff)
downloadmailman2-9fc928ea049f04810ab9b3d1eaabd162abdefe1d.tar.gz
mailman2-9fc928ea049f04810ab9b3d1eaabd162abdefe1d.tar.xz
mailman2-9fc928ea049f04810ab9b3d1eaabd162abdefe1d.zip
As part of the Python 2.6 compatibility changes, we now use Python's email
library if it is new enough rather than installing our own in pythonlib. However, if we are doing an upgrade, there may be an existing email library in pythonlib which is incompatible with Python 2.6 and we need to remove it.
-rw-r--r--misc/Makefile.in4
1 files changed, 4 insertions, 0 deletions
diff --git a/misc/Makefile.in b/misc/Makefile.in
index f57df8c8..d0a0e33b 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -91,6 +91,10 @@ install-other:
$(INSTALL) -m $(FILEMODE) sitelist.cfg $(DESTDIR)$(DATADIR)
install-packages:
+ if [ -z "$(EMAILPKG)" -a -d $(PYTHONLIBDIR)/email ] ; \
+ then \
+ rm -rf $(PYTHONLIBDIR)/email* ; \
+ fi
for p in $(PACKAGES); \
do \
gunzip -c $(srcdir)/$$p.tar.gz | (cd $(PKGDIR) ; tar xf -); \