X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/2fa800105a5897cad85c51c48d1970b9061a33f5..f3c6d21c3e8d8b1cf6fe1780cb45a0177b23c5b6:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6a814ef3..1576daa9 100644
--- 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