X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/9ff18efe9a9fa301fc7a05074b448feb04b9537a..067aa5f013dd6108e81c1df0c2ed19491802bc69:/vars.am

diff --git a/vars.am b/vars.am
index fc00b875..7c686ddd 100644
--- a/vars.am
+++ b/vars.am
@@ -9,19 +9,18 @@
 ###
 ### This file is part of Trivial IP Encryption (TrIPE).
 ###
-### TrIPE is free software; you can redistribute it and/or modify
-### it under the terms of the GNU General Public License as published by
-### the Free Software Foundation; either version 2 of the License, or
-### (at your option) any later version.
+### TrIPE is free software: you can redistribute it and/or modify it under
+### the terms of the GNU General Public License as published by the Free
+### Software Foundation; either version 3 of the License, or (at your
+### option) any later version.
 ###
-### TrIPE is distributed in the hope that it will be useful,
-### but WITHOUT ANY WARRANTY; without even the implied warranty of
-### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-### GNU General Public License for more details.
+### TrIPE is distributed in the hope that it will be useful, but WITHOUT
+### ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+### FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+### for more details.
 ###
 ### You should have received a copy of the GNU General Public License
-### along with TrIPE; if not, write to the Free Software Foundation,
-### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+### along with TrIPE.  If not, see <https://www.gnu.org/licenses/>.
 
 ###--------------------------------------------------------------------------
 ### Initial values of common variables.
@@ -66,9 +65,9 @@ SUBSTITUTIONS = \
 	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)
 
 ###--------------------------------------------------------------------------
@@ -82,9 +81,9 @@ SUFFIXES		+= .8tripe .8.in
 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)