From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 11 Jan 2007 00:10:25 +0000 (+0000)
Subject: doc: Fix distribution of generated manpages.
X-Git-Tag: 1.0.0pre8~84
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/commitdiff_plain/179d81291e52ac1a163f404adaaa6b156aace11e

doc: Fix distribution of generated manpages.

Oops, this is leftover from change 797cf76b...

Also fix the tripemon(8) manpage to use configured paths, and (cheekily)
fix tripemon itself to support TRIPESOCK.
---

diff --git a/configure.in b/configure.in
index 2ba928b2..5c6693d8 100644
--- a/configure.in
+++ b/configure.in
@@ -256,7 +256,8 @@ AC_OUTPUT( \
 	Makefile \
 	common/Makefile client/Makefile server/Makefile \
 	proxy/Makefile pkstream/Makefile \
-	doc/Makefile doc/tripe.8 doc/tripectl.1 \
+	doc/Makefile \
+	  doc/tripe.8 doc/tripectl.1 doc/tripemon.1 \
 	wireshark/Makefile \
 	init/Makefile init/tripe-init \
 	keys/Makefile keys/tripe-keys \
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 462d54fe..d6727718 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -27,13 +27,14 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-CONST_MANS = tripe.8 tripectl.1 pkstream.1 tripe-mitm.8
+CONST_MANS = pkstream.1 tripe-mitm.8
+AUTO_MANS = tripe.8 tripectl.1
 man_MANS = \
-	$(CONST_MANS) tripe-admin.5 \
+	$(CONST_MANS) $(AUTO_MANS) tripe-admin.5 \
 	@pymans@ @pygtkmans@
 
 PYTHONMANS = tripe-keys.8 tripe-keys.conf.5
-PYGTKMANS = tripemon.1
+PYGTKMANS = tripemon.1.in
 EXTRA_DIST = \
 	$(CONST_MANS) tripe-admin.5.in $(PYTHONMANS) $(PYGTKMANS) \
 	make-summary
diff --git a/doc/tripemon.1 b/doc/tripemon.1.in
similarity index 87%
rename from doc/tripemon.1
rename to doc/tripemon.1.in
index 55184938..7f531ccd 100644
--- a/doc/tripemon.1
+++ b/doc/tripemon.1.in
@@ -71,15 +71,18 @@ directory.  The default directory, if this option is not specified, is
 taken from the environment variable
 .BR TRIPEDIR ;
 if that's not defined either, a default default of
-.BR /var/lib/tripe
+.B @configdir@
 is used.
 .TP
-.BI "\-a, \-\-admin=" socket
-If connecting to a running server, connect to the socket named
-.IR socket ;
-if running a new server, instruct it to listen for admin
-connections on
+.BI "\-a, \-\-admin-socket=" socket
+Connect to the named administration
 .IR socket .
+The default socket is given by the environment variable
+.BR TRIPESOCK ;
+if that's not defined either, a default default of
+.B @socketdir@/tripesock
+is used.
+
 .SH "SEE ALSO"
 .BR tripectl (1),
 .BR tripe\-admin (5),
diff --git a/mon/tripemon.in b/mon/tripemon.in
index 0db07752..c7764108 100644
--- a/mon/tripemon.in
+++ b/mon/tripemon.in
@@ -1261,7 +1261,7 @@ def main():
   global tripedir
   if 'TRIPEDIR' in environ:
     tripedir = environ['TRIPEDIR']
-  tripesock = '%s/%s' % (socketdir, 'tripesock')
+  tripesock = environ.get('TRIPESOCK', '%s/%s' % (socketdir, 'tripesock'))
 
   try:
     opts, args = O.getopt(argv[1:],