server/admin.c, server/tripe-admin.5.in: Fix PEERINFO segfault.

[tripe] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6a814ef3efdb6c844e0b8e1b2f4cd4478dae6678..1576daa99d918a851efd8be2b513083240a4a517 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,9 +41,7 @@ SUBDIRS                       += pkstream
 SUBDIRS                        += init
 
 ## Path MTU discovery.
-if PATHMTU
 SUBDIRS                        += pathmtu
-endif
 
 ## Wireshark.
 if HAVE_WIRESHARK
@@ -54,6 +52,7 @@ endif
 if HAVE_PYTHON
 SUBDIRS                        += svc
 SUBDIRS                        += py
+SUBDIRS                        += peerdb
 endif
 
 ## Key-management.
@@ -66,6 +65,9 @@ if HAVE_PYGTK
 SUBDIRS                        += mon
 endif
 
+## Contributed stuff.
+SUBDIRS                        += contrib
+
 ## Testing.
 SUBDIRS                        += t
 
@@ -78,14 +80,14 @@ EXTRA_DIST          += tripe.pc.in
 CLEANFILES             += tripe.pc
 
 tripe.pc: tripe.pc.in Makefile
-       $(confsubst) $(srcdir)/tripe.pc.in >$@.new $(SUBSTITUTIONS) && \
+       $(SUBST) $(srcdir)/tripe.pc.in >$@.new $(SUBSTITUTIONS) && \
                mv $@.new $@
 
 ###--------------------------------------------------------------------------
 ### Release tweaking.
 
 ## Distcheck tweaks.
-DISTCHECK_TUNNELS       = linux bsd unet slip
+DISTCHECK_TUNNELS       = slip
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-tunnel='$(DISTCHECK_TUNNELS)' \
@@ -132,6 +134,10 @@ EXTRA_DIST         += debian/tripe-keys.install
 ## modules
 EXTRA_DIST             += debian/python-tripe.install
 
+## peer services
+EXTRA_DIST             += debian/tripe-peer-services.dirs
+EXTRA_DIST             += debian/tripe-peer-services.install
+
 ## monitor
 EXTRA_DIST             += debian/tripemon.install