diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/Makefile.in | 6 | ||||
| -rw-r--r-- | misc/paths.py.in | 5 | ||||
| -rw-r--r-- | misc/sitelist.cfg | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/misc/Makefile.in b/misc/Makefile.in index 804f140d..d0a0e33b 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -53,7 +53,7 @@ SETUPINSTOPTS= --install-lib $(DESTDIR)$(PYTHONLIBDIR) \ SETUPCMD= setup.py --quiet install $(SETUPINSTOPTS) PKGDIR= $(srcdir) -EMAILPKG= email-2.5.8 +EMAILPKG= @EMAILPKG@ JACODECSPKG= JapaneseCodecs-1.4.11 KOCODECSPKG= KoreanCodecs-2.0.5 @@ -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 -); \ diff --git a/misc/paths.py.in b/misc/paths.py.in index bbf18fc7..f7819920 100644 --- a/misc/paths.py.in +++ b/misc/paths.py.in @@ -1,6 +1,6 @@ # -*- python -*- -# Copyright (C) 1998-2007 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2008 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -36,9 +36,6 @@ exec_prefix = '@exec_prefix@' if exec_prefix == '${prefix}': exec_prefix = prefix -# Supress Python 2.5 warning about string exceptions. -filterwarnings('ignore', '.* string exception', DeprecationWarning) - # Check if ja/ko codecs are available before changing path. try: s = unicode('OK', 'iso-2022-jp') diff --git a/misc/sitelist.cfg b/misc/sitelist.cfg index c8ebfc1d..bd5f4ca5 100644 --- a/misc/sitelist.cfg +++ b/misc/sitelist.cfg @@ -248,7 +248,7 @@ obscure_addresses = 1 # # <p>In the text boxes below, add one address per line; start the line # with a ^ character to designate a <a href= -# "http://www.python.org/doc/current/lib/module-re.html" >Python regular +# "http://docs.python.org/library/re.html" >Python regular # expression</a>. When entering backslashes, do so as if you were using # Python raw strings (i.e. you generally just use a single backslash). # |