From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 7 Jul 2017 10:00:28 +0000 (+0100)
Subject: Makefile.am: Tweak `silent-rules' machinery.
X-Git-Tag: 1.1.1~4
X-Git-Url: https://git.distorted.org.uk/~mdw/rsync-backup/commitdiff_plain/d28417860c4710ba74cb595608177cc1ffdfb976?ds=sidebyside

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 90618b8..8f4c439 100644
--- 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)