From 1822e5eeb1f3716f25d57e881ea8e6bd651fc9c9 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 31 May 2010 23:58:26 +0100
Subject: [PATCH] Makefile.am: Be more careful about what gets distributed.

I've just noticed that I'm shipping all sorts of things which I should
be generating at build time, such as configured versions of
`confsubst'.

Fix this idiocy by removing pkgdata_MUMBLE from EXTRA_DIST and adding
things to dist_pkgdata_MUMBLE instead.  This took a couple of iterations
to get right but I think we're there now.
---
 Makefile.am | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 14de24f..ede8e90 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,9 @@
 
 bin_SCRIPTS		 =
 pkgdata_SCRIPTS		 =
+dist_pkgdata_SCRIPTS	 =
 pkgdata_DATA		 =
+dist_pkgdata_DATA	 =
 
 EXTRA_DIST		 =
 CLEANFILES		 =
@@ -74,23 +76,23 @@ EXTRA_DIST		+= mdw-setup
 ### Files to install.
 
 ## Licences.
-pkgdata_DATA		+= COPYING COPYING.LIB
-pkgdata_DATA		+= gpl.tex lgpl.tex gpl.texi lgpl.texi
+dist_pkgdata_DATA	+= COPYING COPYING.LIB
+dist_pkgdata_DATA	+= gpl.tex lgpl.tex gpl.texi lgpl.texi
 
 ## Documentation.
-pkgdata_DATA		+= INSTALL
-pkgdata_DATA		+= texinice.tex
+dist_pkgdata_DATA	+= INSTALL
+dist_pkgdata_DATA	+= texinice.tex
 
 ## Useful code.
-pkgdata_DATA		+= mdwopt.c mdwopt.h
-pkgdata_DATA		+= getdate.y getdate.h
+dist_pkgdata_DATA	+= mdwopt.c mdwopt.h
+dist_pkgdata_DATA	+= getdate.y getdate.h
 
 ## Scripts.
-pkgdata_SCRIPTS		+= install-ac
-pkgdata_SCRIPTS		+= maninst
+dist_pkgdata_SCRIPTS	+= install-ac
+dist_pkgdata_SCRIPTS	+= maninst
 
 ## Python support stuff.
-pkgdata_SCRIPTS		+= mdwsetup.py
+dist_pkgdata_SCRIPTS	+= mdwsetup.py
 
 ## confsubst
 pkgdata_SCRIPTS		+= confsubst
@@ -113,11 +115,8 @@ auto-version: auto-version.in Makefile
 	$(AM_V_at)mv $@.new $@
 
 ## Testsuites.
-pkgdata_DATA		+= autotest.am
-pkgdata_DATA		+= testsuite.at
-
-EXTRA_DIST		+= $(pkgdata_DATA)
-EXTRA_DIST		+= $(pkgdata_SCRIPTS)
+dist_pkgdata_DATA	+= autotest.am
+dist_pkgdata_DATA	+= testsuite.at
 
 ## Autoconf snippets.
 EXTRA_DIST		+= aclocal.glob
-- 
2.11.0