From 02bac831c6497b863f149f41506bbda8e4af978d Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Mon, 21 Nov 2005 10:27:06 +0000
Subject: Take care to ship a complete tarball even if PYTHON isn't installed.
 Clean up HAVE_PYTHON magic.

svn path=/trunk/; revision=4470
---
 Makefile.am | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index adb41ad3..21435d4a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,10 +15,17 @@ bin_PROGRAMS=		fetchmail
 dist_noinst_SCRIPTS=	specgen.sh
 dist_man1_MANS=		fetchmail.man
 
+pys=			fetchmailconf.py
+pym=			fetchmailconf.man
+
 if HAVE_PYTHON
 nodist_bin_SCRIPTS=	fetchmailconf
-python_PYTHON=		fetchmailconf.py
-dist_man1_MANS+=	fetchmailconf.man
+python_PYTHON=		$(pys)
+dist_man1_MANS+=	$(pym)
+EXTRA_DIST=
+else
+noinst_PYTHON=		$(pys)
+EXTRA_DIST=		$(pym)
 endif
 
 CLEANFILES=		$(nodist_bin_SCRIPTS)
@@ -95,14 +102,14 @@ DISTDOCS=	BUGS FAQ FEATURES NOTES OLDNEWS fetchmail-man.html \
 # extra directories to ship
 distdirs = rh-config contrib beos
 
-EXTRA_DIST= $(DISTDOCS) fetchmail.spec $(distdirs) ucs/README.svn \
-	    trio/CHANGES trio/README strlcpy.3 \
-	    m4-local/ac-archive-license.txt m4-local/ac_ma_search_package.m4
+EXTRA_DIST+=	$(DISTDOCS) fetchmail.spec $(distdirs) ucs/README.svn \
+		trio/CHANGES trio/README \
+		strlcpy.3 \
+		m4-local/ac-archive-license.txt \
+		m4-local/ac_ma_search_package.m4
 
-if HAVE_PYTHON
 fetchmailconf:
 	( echo '#! /bin/sh' && echo 'exec @PYTHON@ @pythondir@/fetchmailconf.py "$$@"' ) >$@ || { rm -f $@ ; exit 1; }
-endif
 
 FAQ: fetchmail-FAQ.html
 	AWK=$(AWK) $(SHELL) $(srcdir)/dist-tools/html2txt $(srcdir)/fetchmail-FAQ.html >$@ || { rm -f $@ ; exit 1 ; }
-- 
cgit v1.2.3