Rename `timeout' to `mtimeout' to prevent conflict with GNU Coreutils.

[misc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 064924628f114819eb0040269977ad7f9d126a31..57162e8224e9ae0937f5771793f28e66f00f8923 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,6 +68,14 @@ pause_LDADD           = $(mLib_LIBS) $(MATH_LIBS)
 dist_man_MANS          += pause.1
 endif
 
+## mtimeout
+if HAVE_MLIB
+bin_PROGRAMS           += mtimeout
+mtimeout_SOURCES        = mtimeout.c
+mtimeout_LDADD          = $(mLib_LIBS) $(MATH_LIBS)
+dist_man_MANS          += mtimeout.1
+endif
+
 ## stamp
 if HAVE_MLIB
 bin_PROGRAMS           += stamp
@@ -128,7 +136,10 @@ dist_sbin_SCRIPTS   =
 
 ## Making substitutions.
 confsubst = $(top_srcdir)/config/confsubst
-SUBST = $(AM_V_GEN)$(confsubst)
+V_SUBST = $(V_SUBST_$(V))
+V_SUBST_ = $(V_SUBST_$(AM_DEFAULT_VERBOSITY))
+V_SUBST_0 = @echo "  SUBST  $@";
+SUBST = $(V_SUBST)$(confsubst)
 SUBSTITUTIONS = \
        PACKAGE=$(PACKAGE) VERSION=$(VERSION) \
        PYTHON=$(PYTHON) \
@@ -221,8 +232,8 @@ man_MANS            += shadowfix.8
 CLEANFILES             += shadowfix.8
 
 shadowfix.8: shadowfix.in
-       $(AM_V_GEN)pod2man --section 8 $(srcdir)/shadowfix.in \
-               >$@.new && mv $@.new $@
+       $(AM_V_GEN)pod2man --section 8 $(srcdir)/shadowfix.in >$@.new && \
+               mv $@.new $@
 
 bin_SCRIPTS            += unfwd
 CLEANFILES             += unfwd