Makefile.am: Tweak `silent-rules' machinery.

Since Automake 1.11, the advice for setting up custom silent-rules
recipes has changed, so use the new machinery.

Also, I'm no longer mainly working on wheezy, and Automake has made the
operation field two spaces wider while I wasn't looking, so make the
output line up properly.

This means that Catacomb now requires Automake 1.11.2 or later to build
from the Git tree.

diff --git a/Makefile.am b/Makefile.am
index 90618b8d1f930f98a4269c76756d3e6caef5655a..8f4c439e97017c15ba1a959e20e03985bfeb76e4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,9 +54,9 @@ SUBSTVARS = \
        pkgdatadir="$(pkgdatadir)" \
        logdir="$(logdir)"
 
-V_SUBST = $(V_SUBST_$V)
-V_SUBST_= $(V_SUBST_$(AM_DEFAULT_VERBOSITY))
-V_SUBST_0 = @printf "  SUBST  %s\n" $@;
+V_SUBST = $(V_SUBST_@AM_V@)
+V_SUBST_= $(V_SUBST_@AM_DEFAULT_V@)
+V_SUBST_0 = @printf "  SUBST    %s\n" $@;
 
 SUBST = $(V_SUBST)$(confsubst)