Build: Fix construction of manual pages.

[tripe] / vars.am

diff --git a/vars.am b/vars.am
index 2e680025c07886a8a2528c62d019be86d7371268..245b98e72bdba033936c1605e13e84b2a3f5d66c 100644 (file)
--- a/vars.am
+++ b/vars.am
@@ -39,15 +39,17 @@ SUFFIXES             =
 
 TRIPE_INCLUDES = \
        -I$(top_builddir)/config.h \
-       -I$(top_srcdir)/common
+       -I$(top_srcdir)/common \
+       -I$(top_srcdir)/priv
 
 CPPFLAGS += $(TRIPE_INCLUDES)
 
 ###--------------------------------------------------------------------------
 ### Miscellanous useful definitions.
 
-## Library of common code.
+## Libraries of common code.
 libtripe = $(top_builddir)/common/libtripe.a
+libpriv = $(top_builddir)/priv/libpriv.a
 
 ## Create a directory if it doesn't exist.
 mkdir_p = $(top_srcdir)/config/install-sh -d
@@ -65,6 +67,7 @@ SUBSTITUTIONS = \
                configdir=$(configdir) socketdir=$(socketdir) \
                initconfig=$(initconfig) \
                pidfile=$(pidfile) logfile=$(logfile) \
+               PACKAGE=$(PACKAGE) VERSION=$(VERSION) \
                PYTHON=$(PYTHON)
 
 ###--------------------------------------------------------------------------
@@ -75,21 +78,14 @@ SUFFIXES            += .5 .5.in
 SUFFIXES               += .7 .7.in
 SUFFIXES               += .8 .8.in
 
-mandefs = $(top_builddir)/defs.man
+mandefs = $(top_srcdir)/common/defs.man
+makesummary = $(top_srcdir)/common/make-summary
 
-mansubst = sed \
-       -e '/@@@PRE@@@/ {' \
-       -e   'r$(mandefs)' \
-       -e   'd' \
-       -e '}'
-
-.1.in.1 .5.in.5 .7.in.7 .8.in.8: $(mandefs)
-       $(mansubst) $< >$@.new && mv $@.new $@
-
-$(mandefs): $(top_srcdir)/defs.man.in Makefile
-       $(confsubst) $(top_srcdir)/defs.man.in >$@.new $(SUBSTITUTIONS)
-       sed '/^\.$$/ d; /^\.\\"/ d' $@.new >$@.new2
-       rm -f $@.new
-       mv $@.new2 $@
+.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 $@
 
 ###----- That's all, folks --------------------------------------------------