From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 13 Sep 2017 11:23:57 +0000 (+0100)
Subject: Makefile.am: Tweak `silent-rules' machinery.
X-Git-Tag: 1.4.3~2
X-Git-Url: https://git.distorted.org.uk/~mdw/misc/commitdiff_plain/99acf5cd9f964d9d42eebed4a27215cda3c57178

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 distorted-utils now requires Automake 1.11.2 or later to
build from the Git tree.
---

diff --git a/Makefile.am b/Makefile.am
index e46fe11..c908472 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -151,9 +151,9 @@ dist_sbin_SCRIPTS	 =
 
 ## Making substitutions.
 confsubst = $(top_srcdir)/config/confsubst
-V_SUBST = $(V_SUBST_$(V))
-V_SUBST_ = $(V_SUBST_$(AM_DEFAULT_VERBOSITY))
-V_SUBST_0 = @echo "  SUBST  $@";
+V_SUBST = $(V_SUBST_@AM_V@)
+V_SUBST_ = $(V_SUBST_@AM_DEFAULT_V@)
+V_SUBST_0 = @echo "  SUBST    $@";
 SUBST = $(V_SUBST)$(confsubst)
 SUBSTITUTIONS = \
 	PACKAGE=$(PACKAGE) VERSION=$(VERSION) \