Release 1.3.0.

[misc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index dce864a..86027e8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,12 +68,12 @@ pause_LDADD          = $(mLib_LIBS) $(MATH_LIBS)
 dist_man_MANS          += pause.1
 endif
 
-## timeout
+## mtimeout
 if HAVE_MLIB
-bin_PROGRAMS           += timeout
-timeout_SOURCES                 = timeout.c
-timeout_LDADD           = $(mLib_LIBS) $(MATH_LIBS)
-dist_man_MANS          += timeout.1
+bin_PROGRAMS           += mtimeout
+mtimeout_SOURCES        = mtimeout.c
+mtimeout_LDADD          = $(mLib_LIBS) $(MATH_LIBS)
+dist_man_MANS          += mtimeout.1
 endif
 
 ## stamp
@@ -92,6 +92,16 @@ locking_LDADD                 = $(mLib_LIBS)
 dist_man_MANS          += locking.1
 endif
 
+## prlimit
+if HAVE_PRLIMIT
+if HAVE_MLIB
+bin_PROGRAMS           += prlimit
+prlimit_SOURCES                 = prlimit.c
+prlimit_LDADD           = $(mLib_LIBS)
+dist_man_MANS          += prlimit.1
+endif
+endif
+
 ## gorp
 if HAVE_CATACOMB
 bin_PROGRAMS           += gorp
@@ -100,14 +110,6 @@ gorp_LDADD          = $(catacomb_LIBS)
 dist_man_MANS          += gorp.1
 endif
 
-## qmail-checkspam
-if HAVE_LIBSPAMC
-sbin_PROGRAMS          += qmail-checkspam
-qmail_checkspam_SOURCES         = qmail-checkspam.c
-qmail_checkspam_LDADD   = -lspamc
-dist_man_MANS          += qmail-checkspam.8
-endif
-
 ## cdb tools
 if HAVE_LIBCDB
 bin_PROGRAMS           += cdb-probe cdb-check-domain
@@ -145,7 +147,8 @@ SUBSTITUTIONS = \
        PYTHON=$(PYTHON) \
        PERL=$(PERL) \
        TCLSH=$(TCLSH) \
-       BASH=$(BASH)
+       BASH=$(BASH) \
+       logdir=$(logdir)
 
 EXTRA_DIST             += config/confsubst
 
@@ -162,6 +165,19 @@ dist_man_MANS              += create.1
 dist_bin_SCRIPTS       += z
 dist_man_MANS          += z.1
 
+bin_SCRIPTS            += hush
+man_MANS               += hush.1
+CLEANFILES             += hush hush.1
+EXTRA_DIST             += hush.in hush.1.in
+
+hush: hush.in Makefile
+       $(SUBST) $(srcdir)/hush.in >$@.new $(SUBSTITUTIONS) && \
+               chmod +x $@.new && mv $@.new $@
+
+hush.1: hush.1.in Makefile
+       $(SUBST) $(srcdir)/hush.1.in >$@.new $(SUBSTITUTIONS) && \
+               mv $@.new $@
+
 ## bash scripts.
 if HAVE_BASH
 
@@ -281,6 +297,7 @@ EXTRA_DIST          += debian/rules
 EXTRA_DIST             += debian/copyright
 EXTRA_DIST             += debian/changelog
 EXTRA_DIST             += debian/control
+EXTRA_DIST             += debian/compat
 
 ## What to install where.
 EXTRA_DIST             += debian/inst