From a1f7867822c8a6fade0e86551af1020d81e0cfc5 Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Mon, 16 Nov 2009 22:09:50 +0200
Subject: [PATCH] Fix Makefile.ams

* Makefile.am (AUX_DIST): Remove autogenerated file. They
are added automatically.
In particular, mkinstalldirs is no longer needed.
* doc/Makefile.am (EXTRA_DIST): Addd missing files.
* libsmmap/Makefile.am (TESTP): Missed t-seqr-0.
* misc/Makefile.am (metaqueue): Fix sed rules.
---
 Makefile.am          |    8 ++++----
 doc/Makefile.am      |    9 ++++++---
 libsmmap/Makefile.am |    1 +
 misc/Makefile.am     |    3 ++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8f90a9d..73f3684 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,10 +12,10 @@ endif
 SUBDIRS = include librepl @MTA_BDBBLD@ statethreads ${Check1} libmta libdns libsmmap libconf libcdb libibdb libiqdb libedb libedbc libactdb libdadb libthr libevthr libpmilter smtps smtpc qmgr smar mcp ${Checks} misc perf doc man contrib
 
 auxdir			= @ac_aux_dir@
-AUX_DIST		= $(auxdir)/install-sh $(auxdir)/missing \
-	$(auxdir)/mkinstalldirs \
-	$(auxdir)/config.guess $(auxdir)/build \
-	$(auxdir)/dh.m4 $(auxdir)/acsite.m4 $(auxdir)/acx_pthread.m4
+AUX_DIST		= $(auxdir)/build \
+	                  $(auxdir)/dh.m4 \
+	                  $(auxdir)/acsite.m4 \
+	                  $(auxdir)/acx_pthread.m4
 
 EXTRA_DIST 	      = README README.dev \
 			LICENSE license/LICENSE.3C \
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8bbbebf..0278ee6 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,9 +1,6 @@
 # $Id: Makefile.am,v 1.14 2008/02/06 22:59:09 ca Exp $
 
 MAINTAINERCLEANFILES	= Makefile.in
-EXTRA_DIST		= pmilter.api.tex \
-	overview1.eps overview1.gif overview1.pdf \
-	html2txt
 
 pngfiles = img1.png img2.png img3.png img4.png img5.png img6.png \
 	   nx_grp_g.png prev_g.png up_g.png
@@ -15,6 +12,12 @@ noinst_DATA = README.tex \
 	      README.css \
               $(pngfiles)
 
+EXTRA_DIST = $(noinst_DATA) \
+             pmilter.api.tex \
+	     overview1.eps overview1.gif overview1.pdf \
+	     html2txt \
+             README.aux README.bbl
+
 L2HOPT=-a -e2
 L2H=tth
 SED=sed
diff --git a/libsmmap/Makefile.am b/libsmmap/Makefile.am
index 63eb781..6c891f6 100644
--- a/libsmmap/Makefile.am
+++ b/libsmmap/Makefile.am
@@ -78,6 +78,7 @@ TESTP=	t-mapr-0 \
 	t-bhtr-0 \
 	t-bhtr-1 \
 	t-passwdr-0 \
+	t-seqr-0 \
 	t-seqr-1 \
 	t-map-reopenr-1
 # compile only, do not run
diff --git a/misc/Makefile.am b/misc/Makefile.am
index c580d19..5875cdb 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -37,7 +37,8 @@ metaconf_LDADD  = $(LDRCB) $(LDCONF) $(LDADD) $(LDMISC) $(LDREPL)
 
 metaqueue: ${top_srcdir}/misc/metaqueue.in Makefile
 	sed -e 's,@''bindir''@,@bindir@,g' \
-            -e '/^MAILQPROG=/{s/^MAILQPROG=//;$(transform);s/^/MAILQPROG=/}' ${top_srcdir}/misc/metaqueue.in > metaqueue.tmp
+            -e '/^MAILQPROG=/{s/^MAILQPROG=//;$(transform);s/^/MAILQPROG=/;}' \
+            ${top_srcdir}/misc/metaqueue.in > metaqueue.tmp
 	if cmp metaqueue.tmp metaqueue >/dev/null 2>&1; then \
 		rm metaqueue.tmp; \
 	else \
-- 
1.6.0.3