admin.c (a_format): New function formats token sequences to strings.

[tripe] / vars.am

diff --git a/vars.am b/vars.am
index 4c2b81580fc7f7e4dc2e013e0890ec36e1dcbbe4..5a9938d6bc82ff656f1cc2d3eb030f514e1cc330 100644 (file)
--- a/vars.am
+++ b/vars.am
@@ -39,18 +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
-
-## Create a directory if it doesn't exist.
-mkdir_p = $(top_srcdir)/config/install-sh -d
+libpriv = $(top_builddir)/priv/libpriv.a
 
 ## Substitute tags in files.
 confsubst = $(top_srcdir)/config/confsubst
@@ -65,6 +64,36 @@ SUBSTITUTIONS = \
                configdir=$(configdir) socketdir=$(socketdir) \
                initconfig=$(initconfig) \
                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
+
+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    $@";
+
+.1.in.1 .5.in.5 .7.in.7 .8.in.8:
+       $(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 --------------------------------------------------