X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/c7211b0d98a2485c859133b2dc129cdfd93eb67f..4da9fb4c5f42b0836a09577a8282121a6ff29d2b:/vars.am

diff --git a/vars.am b/vars.am
index d4cdafbd..093e1728 100644
--- a/vars.am
+++ b/vars.am
@@ -38,11 +38,10 @@ SUFFIXES		 =
 ### Include path.
 
 TRIPE_INCLUDES = \
-	-I$(top_builddir)/config.h \
 	-I$(top_srcdir)/common \
 	-I$(top_srcdir)/priv
 
-CPPFLAGS += $(TRIPE_INCLUDES)
+AM_CPPFLAGS += $(TRIPE_INCLUDES)
 
 ###--------------------------------------------------------------------------
 ### Miscellanous useful definitions.
@@ -62,27 +61,38 @@ SUBSTITUTIONS = \
 		libdir=$(libdir) includedir=$(includedir) \
 		bindir=$(bindir) sbindir=$(sbindir) \
 		configdir=$(configdir) socketdir=$(socketdir) \
-		initconfig=$(initconfig) \
+		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)
+
 ###--------------------------------------------------------------------------
 ### Manpage substitutions.
 
-SUFFIXES		+= .1 .1.in
-SUFFIXES		+= .5 .5.in
-SUFFIXES		+= .7 .7.in
-SUFFIXES		+= .8 .8.in
+SUFFIXES		+= .1tripe .1.in .1
+SUFFIXES		+= .5tripe .5.in
+SUFFIXES		+= .7tripe .7.in
+SUFFIXES		+= .8tripe .8.in
 
 mandefs = $(top_srcdir)/common/defs.man
 makesummary = $(top_srcdir)/common/make-summary
 
-.1.in.1 .5.in.5 .7.in.7 .8.in.8:
-	sed '/^\.$$/ d; /^\.\\"/ d' $(mandefs) >$@.defs
-	sed -e '/@@@PRE@@@/ {' -e 'r$@.defs' -e 'd' -e '}' $< >$@.merge
-	$(confsubst) $@.merge >$@.subst $(SUBSTITUTIONS)
-	awk -f $(makesummary) $@.subst >$@.new
-	rm -f $@.defs $@.merge $@.subst && mv $@.new $@
+V_MAN = $(V_MAN_$(V))
+V_MAN_ = $(V_MAN_$(AM_DEFAULT_VERBOSITY))
+V_MAN_0 = @echo "  MAN    $@";
+
+.1.in.1 .1.in.1tripe .5.in.5tripe .7.in.7tripe .8.in.8tripe:
+	$(V_MAN)
+	$(AM_V_at)sed '/^\.$$/ d; /^\.\\"/ d' $(mandefs) >$@.defs
+	$(AM_V_at)sed -e '/@@@PRE@@@/ {' -e 'r$@.defs' -e 'd' -e '}' \
+		$< >$@.merge
+	$(AM_V_at)$(confsubst) $@.merge >$@.subst $(SUBSTITUTIONS)
+	$(AM_V_at)awk -f $(makesummary) $@.subst >$@.new
+	$(AM_V_at)rm -f $@.defs $@.merge $@.subst && mv $@.new $@
 
 ###----- That's all, folks --------------------------------------------------