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 2ba928b27c1b20e17383248c0ba3007843b80672..5c6693d88c69cd8e97ea29dd0e870468d996225d 100644 (file)
--- 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 462d54fef6340afc98afa25529c10ff5de0fa500..d672771853c596bf2efceb8d001ab77b2259ca26 100644 (file)
--- 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 5518493866bfb44db8a46305946e868492660443..7f531ccdaa69ff5db0b44c65f4acfa40f05391d2 100644 (file)
--- 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 0db0775247603f6c6f9d14010d65fb6fa90615dc..c7764108f88045fb2db6e5c2d348bf00717fe697 100644 (file)
--- 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:],