chiark / gitweb /
debian/: Redo the multiarch support for Debhelper 9.
[tripe] / vars.am
diff --git a/vars.am b/vars.am
index 093e172..28a5e50 100644 (file)
--- a/vars.am
+++ b/vars.am
@@ -41,35 +41,35 @@ TRIPE_INCLUDES = \
        -I$(top_srcdir)/common \
        -I$(top_srcdir)/priv
 
        -I$(top_srcdir)/common \
        -I$(top_srcdir)/priv
 
-AM_CPPFLAGS += $(TRIPE_INCLUDES)
+AM_CPPFLAGS            += $(TRIPE_INCLUDES)
 
 ###--------------------------------------------------------------------------
 ### Miscellanous useful definitions.
 
 ## Libraries of common code.
 
 ###--------------------------------------------------------------------------
 ### Miscellanous useful definitions.
 
 ## Libraries of common code.
-libtripe = $(top_builddir)/common/libtripe.a
-libpriv = $(top_builddir)/priv/libpriv.a
-
-## Substitute tags in files.
-confsubst = $(top_srcdir)/config/confsubst
+libtripe                = $(top_builddir)/common/libtripe.a
+libpriv                         = $(top_builddir)/priv/libpriv.a
 
 ###--------------------------------------------------------------------------
 ### Standard configuration substitutions.
 
 
 ###--------------------------------------------------------------------------
 ### Standard configuration substitutions.
 
+## Substitute tags in files.
+confsubst               = $(top_srcdir)/config/confsubst
+
 SUBSTITUTIONS = \
 SUBSTITUTIONS = \
-               prefix=$(prefix) exec_prefix=$(exec_prefix) \
-               libdir=$(libdir) includedir=$(includedir) \
-               bindir=$(bindir) sbindir=$(sbindir) \
-               configdir=$(configdir) socketdir=$(socketdir) \
-               initconfig=$(initconfig) pkglibdir=$(pkglibdir) \
-               pidfile=$(pidfile) logfile=$(logfile) \
-               PACKAGE=$(PACKAGE) VERSION=$(VERSION) \
-               PYTHON=$(PYTHON)
-
-V_SUBST = $(V_SUBST_$(V))
-V_SUBST_ = $(V_SUBST_$(AM_DEFAULT_VERBOSITY))
-V_SUBST_0 = @echo "  SUBST  $@";
-SUBST = $(V_SUBST)$(confsubst)
+       prefix=$(prefix) exec_prefix=$(exec_prefix) \
+       libdir=$(libdir) includedir=$(includedir) \
+       bindir=$(bindir) sbindir=$(sbindir) \
+       configdir=$(configdir) socketdir=$(socketdir) \
+       initconfig=$(initconfig) pkglibdir=$(pkglibdir) \
+       pidfile=$(pidfile) logfile=$(logfile) \
+       PACKAGE=$(PACKAGE) VERSION=$(VERSION) \
+       PYTHON=$(PYTHON)
+
+V_SUBST                         = $(V_SUBST_@AM_V@)
+V_SUBST_                = $(V_SUBST_@AM_DEFAULT_V@)
+V_SUBST_0               = @echo "  SUBST    $@";
+SUBST                   = $(V_SUBST)$(confsubst)
 
 ###--------------------------------------------------------------------------
 ### Manpage substitutions.
 
 ###--------------------------------------------------------------------------
 ### Manpage substitutions.
@@ -79,12 +79,12 @@ SUFFIXES            += .5tripe .5.in
 SUFFIXES               += .7tripe .7.in
 SUFFIXES               += .8tripe .8.in
 
 SUFFIXES               += .7tripe .7.in
 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)