server/tests.at (server retry): Use the new `WITH_STRACE' macro.

[tripe] / vars.am

diff --git a/vars.am b/vars.am
index 5a9938d6bc82ff656f1cc2d3eb030f514e1cc330..093e17286c1da21b1d271328f1c6ee599c92016b 100644 (file)
--- a/vars.am
+++ b/vars.am
@@ -38,11 +38,10 @@ SUFFIXES             =
 ### Include path.
 
 TRIPE_INCLUDES = \
 ### Include path.
 
 TRIPE_INCLUDES = \

-       -I$(top_builddir)/config.h \

        -I$(top_srcdir)/common \
        -I$(top_srcdir)/priv
 
        -I$(top_srcdir)/common \
        -I$(top_srcdir)/priv
 

-CPPFLAGS += $(TRIPE_INCLUDES)
+AM_CPPFLAGS += $(TRIPE_INCLUDES)

 
 ###--------------------------------------------------------------------------
 ### Miscellanous useful definitions.
 
 ###--------------------------------------------------------------------------
 ### Miscellanous useful definitions.


@@ -62,7 +61,7 @@ SUBSTITUTIONS = \
                libdir=$(libdir) includedir=$(includedir) \
                bindir=$(bindir) sbindir=$(sbindir) \
                configdir=$(configdir) socketdir=$(socketdir) \
                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)
                pidfile=$(pidfile) logfile=$(logfile) \
                PACKAGE=$(PACKAGE) VERSION=$(VERSION) \
                PYTHON=$(PYTHON)


@@ -75,10 +74,10 @@ SUBST = $(V_SUBST)$(confsubst)
 ###--------------------------------------------------------------------------
 ### Manpage substitutions.
 
 ###--------------------------------------------------------------------------
 ### 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
 
 mandefs = $(top_srcdir)/common/defs.man
 makesummary = $(top_srcdir)/common/make-summary


@@ -87,7 +86,7 @@ V_MAN = $(V_MAN_$(V))
 V_MAN_ = $(V_MAN_$(AM_DEFAULT_VERBOSITY))
 V_MAN_0 = @echo "  MAN    $@";
 
 V_MAN_ = $(V_MAN_$(AM_DEFAULT_VERBOSITY))
 V_MAN_0 = @echo "  MAN    $@";
 

-.1.in.1 .5.in.5 .7.in.7 .8.in.8:
+.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 '}' \
        $(V_MAN)
        $(AM_V_at)sed '/^\.$$/ d; /^\.\\"/ d' $(mandefs) >$@.defs
        $(AM_V_at)sed -e '/@@@PRE@@@/ {' -e 'r$@.defs' -e 'd' -e '}' \