debian/: Redo the multiarch support for Debhelper 9.

[tripe] / vars.am

diff --git a/vars.am b/vars.am
index fc00b875eb2461f92db1b5457c60f64a2eb34451..28a5e50ee0388c041c5fc5e5bdcb90c373f3f705 100644 (file)
--- a/vars.am
+++ b/vars.am
@@ -66,9 +66,9 @@ SUBSTITUTIONS = \
        PACKAGE=$(PACKAGE) VERSION=$(VERSION) \
        PYTHON=$(PYTHON)
 
        PACKAGE=$(PACKAGE) VERSION=$(VERSION) \
        PYTHON=$(PYTHON)
 

-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)
 
 ###--------------------------------------------------------------------------
 SUBST                   = $(V_SUBST)$(confsubst)
 
 ###--------------------------------------------------------------------------


@@ -82,9 +82,9 @@ SUFFIXES              += .8tripe .8.in
 mandefs                         = $(top_srcdir)/common/defs.man
 makesummary             = $(top_srcdir)/common/make-summary
 
 mandefs                         = $(top_srcdir)/common/defs.man
 makesummary             = $(top_srcdir)/common/make-summary
 

-V_MAN                   = $(V_MAN_$(V))
-V_MAN_                  = $(V_MAN_$(AM_DEFAULT_VERBOSITY))
-V_MAN_0                         = @echo "  MAN    $@";
+V_MAN                   = $(V_MAN_@AM_V@)
+V_MAN_                  = $(V_MAN_@AM_DEFAULT_V@)
+V_MAN_0                         = @echo "  MAN      $@";

 
 .1.in.1 .1.in.1tripe .5.in.5tripe .7.in.7tripe .8.in.8tripe:
        $(V_MAN)
 
 .1.in.1 .1.in.1tripe .5.in.5tripe .7.in.7tripe .8.in.8tripe:
        $(V_MAN)