X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/118a549cc82f07b4c8b13aeebd866d2912ff3f1b..fbc7337cd60bcad9c8df6d7294835ece78cee630:/vars.am

diff --git a/vars.am b/vars.am
index 8d34b68..9870cef 100644
--- a/vars.am
+++ b/vars.am
@@ -27,11 +27,6 @@
 ###--------------------------------------------------------------------------
 ### Miscellaneous useful definitions.
 
-## Some convenient abbreviations for file suffixes.
-e			 = $(EXEEXT)
-o			 = $(OBJEXT)
-t			 = t$e
-
 ## Installation directories.
 pkglibexecdir		 = $(libexecdir)/$(PACKAGE)
 
@@ -92,12 +87,13 @@ SUBSTITUTIONS = \
 	prefix=$(prefix) exec_prefix=$(exec_prefix) \
 	libdir=$(libdir) includedir=$(includedir) \
 	bindir=$(bindir) sbindir=$(sbindir) \
-	PACKAGE=$(PACKAGE) VERSION=$(VERSION)
+	PACKAGE=$(PACKAGE) VERSION=$(VERSION) \
+	MLIB_LIBS="$(MLIB_LIBS)"
 
-V_SUBST = $(V_SUBST_$(V))
-V_SUBST_ = $(V_SUBST_$(AM_DEFAULT_VERBOSITY))
-V_SUBST_0 = @echo "  SUBST  $@";
-SUBST = $(V_SUBST)$(confsubst)
+V_SUBST			 = $(V_SUBST_@AM_V@)
+V_SUBST_		 = $(V_SUBST_@AM_DEFAULT_V@)
+V_SUBST_0		 = @echo "  SUBST    $@";
+SUBST			 = $(V_SUBST)$(confsubst)
 
 ###--------------------------------------------------------------------------
 ### Building utilities.