X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/a62f8e8a94bf56194539f7140a1215bc74309b36..8f3f3ac7bc6903f29c6803ca29c14f9bfe4d2d68:/debian/rules

diff --git a/debian/rules b/debian/rules
index 0a422e83..b9a095f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,10 +22,9 @@ DEB_CONFIGURE_EXTRA_FLAGS = \
 	--with-tunnel="$(default_tunnel) slip" \
 	--with-configdir="/etc/tripe" \
 	--with-socketdir="/var/run" \
-	--with-logfile="/var/log/tripe.log" \
+	--with-logfile="/var/log/tripe/tripe.log" \
 	--with-pidfile="/var/run/tripectl.pid" \
-	--with-initconfig="/etc/default/tripe" \
-	--with-wireshark
+	--with-initconfig="/etc/default/tripe"
 
 ###--------------------------------------------------------------------------
 ### Python.
@@ -38,7 +37,13 @@ binary-install/python-tripe::
 
 install/tripe::
 	cp $(DEB_BUILDDIR)/init/tripe-init debian/tripe.init
-	cp $(DEB_SRCDIR)/init/tripe.conf debian/tripe.default
+	sed 's/^#\(user\|group\)/\1/' \
+		$(DEB_SRCDIR)/init/tripe.conf >debian/tripe.default
+	mkdir -p debian/tripe/usr/share/doc/tripe/examples
+	for i in tripe-ipif ipif-peers tripe-upstart greet knock; do \
+	  cp $(DEB_BUILDDIR)/contrib/$$i \
+		debian/tripe/usr/share/doc/tripe/examples; \
+	done
 
 cleanbuilddir::
 	rm -f debian/tripe.init debian/tripe.default
@@ -55,7 +60,7 @@ install/tripe-peer-services::
 
 ## Grab the version we built against, so we can put it in the dependencies.
 install/tripe-wireshark::
-	dpkg --status wireshark | \
+	dpkg --status wireshark-common | \
 		sed -n 's/^Version: */tripe:Wireshark-Version=/p' \
 		>> debian/tripe-wireshark.substvars