From 9fc928ea049f04810ab9b3d1eaabd162abdefe1d Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Tue, 2 Dec 2008 14:00:39 -0800 Subject: 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. --- misc/Makefile.in | 4 ++++ 1 file changed, 4 insertions(+) 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 -); \ -- cgit v1.2.3