From 057d4d421c32c0458f7be320978d36b553a609cd Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Fri, 17 Aug 2012 18:15:02 +0200
Subject: [PATCH] Fix installation when PYTHON is enabled.

The Python-related Makefile.am parts were simplified to avoid an
automake 1.11.X bug around noinst_PYTHON, Automake Bug #10995.
http://lists.gnu.org/archive/html/automake-patches/2012-03/txtbYNp7SPawU.txt
---
 Makefile.am | 8 +-------
 NEWS        | 3 +++
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8c34c75f..6f247dae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,15 +16,9 @@ dist_man1_MANS=		fetchmail.man
 pys=			fetchmailconf.py
 pym=			fetchmailconf.man
 
-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)
 
@@ -155,7 +149,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 \
 		trio/CHANGES trio/README \
 		strlcpy.3 bighand.png \
diff --git a/NEWS b/NEWS
index 36014655..626fabb2 100644
--- a/NEWS
+++ b/NEWS
@@ -110,6 +110,9 @@ fetchmail-6.3.22 (not yet released):
   under the more relaxed CC BY-ND 3.0 license (the noncommercial clause
   was dropped). The Creative Commons address was updated.
 
+* The Python-related Makefile.am parts were simplified to avoid an automake
+  1.11.X bug around noinst_PYTHON, Automake Bug #10995.
+
 # WORKAROUND
 * Some servers, notably Zimbra, return A1234 987 FETCH () in response to
   a header request, in the face of message corruption.  fetchmail now treats
-- 
2.43.2