Merge branch 'legacy_63'

[~andy/fetchmail] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0bdbfa43041f8a485395f5170b4f49a46774fcc4..42fd08900c31ea88563046b69f6a97b5571a5ec0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,11 +25,6 @@ if HAVE_PYTHON
 nodist_bin_SCRIPTS=    fetchmailconf
 python_PYTHON=         $(pys)
 dist_man1_MANS+=       $(pym)
-EXTRA_DIST=
-else
-noinst_PYTHON=         $(pys)
-EXTRA_DIST=            $(pym)
-endif
 
 CLEANFILES=            $(nodist_bin_SCRIPTS)
 
@@ -120,6 +115,8 @@ DISTDOCS=   FAQ FEATURES NOTES OLDNEWS fetchmail-man.html \
                README.packaging README.SSL-SERVER \
                fetchmail-FAQ.book fetchmail-FAQ.pdf fetchmail-FAQ.html \
                Mailbox-Names-UTF7.txt Mailbox-Names-UTF7.html \
+               fetchmail-SA-2012-02.txt \
+               fetchmail-SA-2012-01.txt \
                fetchmail-SA-2011-01.txt \
                fetchmail-EN-2010-03.txt \
                fetchmail-SA-2010-02.txt \
@@ -138,7 +135,7 @@ DISTDOCS=   FAQ FEATURES NOTES OLDNEWS fetchmail-man.html \
 # extra directories to ship
 distdirs = rh-config contrib beos
 
-EXTRA_DIST+=   $(DISTDOCS) $(distdirs) \
+EXTRA_DIST=    $(DISTDOCS) $(distdirs) \
                fetchmail.spec fetchmail.xpm \
                strlcpy.3 bighand.png \
                m4/codeset.m4 \