From: Mark Wooding Date: Sat, 2 May 2015 16:05:20 +0000 (+0100) Subject: build, debian: Add a suffix to the main TrIPE-specific manpages. X-Git-Tag: 1.0.0pre17~2 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/commitdiff_plain/0647ba7c7c989692ecd256674316fbf71ca76fed build, debian: Add a suffix to the main TrIPE-specific manpages. This keeps the service documentation, in particular, out of the general namespace where things might conflict with it. The general-purpose utilities `pkstream' and `pathmtu' are not affected by this change. --- diff --git a/client/Makefile.am b/client/Makefile.am index 4e03c3be..61921370 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -38,8 +38,8 @@ bin_PROGRAMS += tripectl tripectl_SOURCES = tripectl.c ## Manual page. -man_MANS += tripectl.1 -CLEANFILES += tripectl.1 +man_MANS += tripectl.1tripe +CLEANFILES += tripectl.1tripe EXTRA_DIST += tripectl.1.in ###----- That's all, folks -------------------------------------------------- diff --git a/client/tripectl.1.in b/client/tripectl.1.in index 33e56cc9..523b1f05 100644 --- a/client/tripectl.1.in +++ b/client/tripectl.1.in @@ -27,7 +27,7 @@ .so ../common/defs.man \" @@@PRE@@@ . .\"-------------------------------------------------------------------------- -.TH tripectl 1 "19 February 2001" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" +.TH tripectl 1tripe "19 February 2001" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" . .\"-------------------------------------------------------------------------- .SH "NAME" diff --git a/debian/tripe-keys.install b/debian/tripe-keys.install index 06cc965e..6308b81d 100644 --- a/debian/tripe-keys.install +++ b/debian/tripe-keys.install @@ -1,4 +1,4 @@ debian/tmp/usr/sbin/tripe-keys -debian/tmp/usr/share/man/man5/tripe-keys.conf.5 -debian/tmp/usr/share/man/man8/tripe-keys.8 +debian/tmp/usr/share/man/man5/tripe-keys.conf.5tripe +debian/tmp/usr/share/man/man8/tripe-keys.8tripe keys/tripe-keys.master usr/share/doc/tripe-keys/examples diff --git a/debian/tripe-peer-services.install b/debian/tripe-peer-services.install index 9bd42cbe..6d621d7d 100644 --- a/debian/tripe-peer-services.install +++ b/debian/tripe-peer-services.install @@ -1,10 +1,10 @@ debian/tmp/usr/lib/tripe/services/connect -debian/tmp/usr/share/man/man8/connect.8 +debian/tmp/usr/share/man/man8/connect.8tripe debian/tmp/usr/lib/tripe/services/conntrack -debian/tmp/usr/share/man/man8/conntrack.8 +debian/tmp/usr/share/man/man8/conntrack.8tripe debian/tmp/usr/sbin/tripe-newpeers -debian/tmp/usr/share/man/man8/tripe-newpeers.8 -debian/tmp/usr/share/man/man5/peers.in.5 -debian/tmp/usr/share/man/man5/peers.cdb.5 +debian/tmp/usr/share/man/man8/tripe-newpeers.8tripe +debian/tmp/usr/share/man/man5/peers.in.5tripe +debian/tmp/usr/share/man/man5/peers.cdb.5tripe debian/tmp/usr/sbin/tripe-ifup -debian/tmp/usr/share/man/man8/tripe-ifup.8 +debian/tmp/usr/share/man/man8/tripe-ifup.8tripe diff --git a/debian/tripe-uslip.install b/debian/tripe-uslip.install index 9115b0ff..cccaa1b1 100644 --- a/debian/tripe-uslip.install +++ b/debian/tripe-uslip.install @@ -1,2 +1,2 @@ debian/tmp/usr/bin/tripe-uslip -debian/tmp/usr/share/man/man1/tripe-uslip.1 +debian/tmp/usr/share/man/man1/tripe-uslip.1tripe diff --git a/debian/tripe.install b/debian/tripe.install index be519d8b..d6a2b212 100644 --- a/debian/tripe.install +++ b/debian/tripe.install @@ -1,11 +1,11 @@ debian/tmp/usr/bin/tripectl debian/tmp/usr/sbin/tripe -debian/tmp/usr/share/man/man1/tripectl.1 -debian/tmp/usr/share/man/man5/tripe-admin.5 -debian/tmp/usr/share/man/man7/tripe-service.7 -debian/tmp/usr/share/man/man8/tripe.8 +debian/tmp/usr/share/man/man1/tripectl.1tripe +debian/tmp/usr/share/man/man5/tripe-admin.5tripe +debian/tmp/usr/share/man/man7/tripe-service.7tripe +debian/tmp/usr/share/man/man8/tripe.8tripe debian/tmp/usr/lib/tripe/tripe-privhelper -debian/tmp/usr/share/man/man8/tripe-privhelper.8 +debian/tmp/usr/share/man/man8/tripe-privhelper.8tripe debian/tmp/usr/lib/pkgconfig/tripe.pc debian/build/contrib/tripe-ipif /usr/share/doc/tripe/examples diff --git a/debian/tripemon.install b/debian/tripemon.install index 6a313db6..d99a4564 100644 --- a/debian/tripemon.install +++ b/debian/tripemon.install @@ -1,2 +1,2 @@ debian/tmp/usr/bin/tripemon -debian/tmp/usr/share/man/man1/tripemon.1 +debian/tmp/usr/share/man/man1/tripemon.1tripe diff --git a/keys/Makefile.am b/keys/Makefile.am index 68a0d221..2c6b26ba 100644 --- a/keys/Makefile.am +++ b/keys/Makefile.am @@ -41,8 +41,8 @@ tripe-keys: tripe-keys.in Makefile chmod +x $@.new && mv $@.new $@ ## Manual pages. -man_MANS += tripe-keys.8 tripe-keys.conf.5 -CLEANFILES += tripe-keys.8 tripe-keys.conf.5 +man_MANS += tripe-keys.8tripe tripe-keys.conf.5tripe +CLEANFILES += tripe-keys.8tripe tripe-keys.conf.5tripe EXTRA_DIST += tripe-keys.8.in tripe-keys.conf.5.in ## Examples. diff --git a/keys/tripe-keys.8.in b/keys/tripe-keys.8.in index f94f9687..be6cc3da 100644 --- a/keys/tripe-keys.8.in +++ b/keys/tripe-keys.8.in @@ -27,7 +27,7 @@ .so ../common/defs.man \" @@@PRE@@@ . .\"-------------------------------------------------------------------------- -.TH tripe-keys 8 "14 September 2005" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" +.TH tripe-keys 8tripe "14 September 2005" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" . .\"-------------------------------------------------------------------------- .SH "NAME" diff --git a/keys/tripe-keys.conf.5.in b/keys/tripe-keys.conf.5.in index 468070a9..49e360d2 100644 --- a/keys/tripe-keys.conf.5.in +++ b/keys/tripe-keys.conf.5.in @@ -27,7 +27,7 @@ .so ../common/defs.man \" @@@PRE@@@ . .\"-------------------------------------------------------------------------- -.TH tripe-keys.conf 5 "14 September 2005" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" +.TH tripe-keys.conf 5tripe "14 September 2005" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" . .\"-------------------------------------------------------------------------- .SH "NAME" diff --git a/mon/Makefile.am b/mon/Makefile.am index 128c35e3..d2a92e0b 100644 --- a/mon/Makefile.am +++ b/mon/Makefile.am @@ -41,8 +41,8 @@ tripemon: tripemon.in Makefile chmod +x $@.new && mv $@.new $@ ## Manual page. -man_MANS += tripemon.1 -CLEANFILES += tripemon.1 +man_MANS += tripemon.1tripe +CLEANFILES += tripemon.1tripe EXTRA_DIST += tripemon.1.in ###----- That's all, folks -------------------------------------------------- diff --git a/mon/tripemon.1.in b/mon/tripemon.1.in index cea91c65..c87a4246 100644 --- a/mon/tripemon.1.in +++ b/mon/tripemon.1.in @@ -27,7 +27,7 @@ .so ../common/defs.man \" @@@PRE@@@ . .\"-------------------------------------------------------------------------- -.TH tripemon 1 "4 October 2005" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" +.TH tripemon 1tripe "4 October 2005" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" . .\"-------------------------------------------------------------------------- .SH "NAME" diff --git a/peerdb/Makefile.am b/peerdb/Makefile.am index 3688a3f2..20e14301 100644 --- a/peerdb/Makefile.am +++ b/peerdb/Makefile.am @@ -40,16 +40,16 @@ tripe-newpeers: tripe-newpeers.in Makefile chmod +x $@.new && mv $@.new $@ ## Manual pages. -man_MANS += peers.cdb.5 -CLEANFILES += peers.cdb.5 +man_MANS += peers.cdb.5tripe +CLEANFILES += peers.cdb.5tripe EXTRA_DIST += peers.cdb.5.in -man_MANS += peers.in.5 -CLEANFILES += peers.in.5 +man_MANS += peers.in.5tripe +CLEANFILES += peers.in.5tripe EXTRA_DIST += peers.in.5.in -man_MANS += tripe-newpeers.8 -CLEANFILES += tripe-newpeers.8 +man_MANS += tripe-newpeers.8tripe +CLEANFILES += tripe-newpeers.8tripe EXTRA_DIST += tripe-newpeers.8.in ## Install peer database sources. diff --git a/peerdb/peers.cdb.5.in b/peerdb/peers.cdb.5.in index 187de0f2..09913ade 100644 --- a/peerdb/peers.cdb.5.in +++ b/peerdb/peers.cdb.5.in @@ -27,7 +27,7 @@ .so ../defs.man.in \"@@@PRE@@@ . .\"-------------------------------------------------------------------------- -.TH peers.cdb 5 "27 March 2008" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" +.TH peers.cdb 5tripe "27 March 2008" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" . .\"-------------------------------------------------------------------------- .SH "NAME" diff --git a/peerdb/peers.in.5.in b/peerdb/peers.in.5.in index c718fb11..9ce9561c 100644 --- a/peerdb/peers.in.5.in +++ b/peerdb/peers.in.5.in @@ -27,7 +27,7 @@ .so ../defs.man.in \"@@@PRE@@@ . .\"-------------------------------------------------------------------------- -.TH peers.in 5 "27 March 2008" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" +.TH peers.in 5tripe "27 March 2008" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" . .\"-------------------------------------------------------------------------- .SH "NAME" diff --git a/peerdb/tripe-newpeers.8.in b/peerdb/tripe-newpeers.8.in index 17d00550..3fa4ccbf 100644 --- a/peerdb/tripe-newpeers.8.in +++ b/peerdb/tripe-newpeers.8.in @@ -27,7 +27,7 @@ .so ../defs.man.in \"@@@PRE@@@ . .\"-------------------------------------------------------------------------- -.TH tripe-newpeers 8 "11 December 2008" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" +.TH tripe-newpeers 8tripe "11 December 2008" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" . .\"-------------------------------------------------------------------------- .SH "NAME" diff --git a/priv/Makefile.am b/priv/Makefile.am index e0a46769..80b935d4 100644 --- a/priv/Makefile.am +++ b/priv/Makefile.am @@ -49,8 +49,8 @@ libpriv_a_SOURCES += comm.c tripe_privhelper_SOURCES = helper.c ## Manual page. -man_MANS += tripe-privhelper.8 -CLEANFILES += tripe-privhelper.8 +man_MANS += tripe-privhelper.8tripe +CLEANFILES += tripe-privhelper.8tripe EXTRA_DIST += tripe-privhelper.8.in ###----- That's all, folks -------------------------------------------------- diff --git a/priv/tripe-privhelper.8.in b/priv/tripe-privhelper.8.in index 0d7d50d6..28372069 100644 --- a/priv/tripe-privhelper.8.in +++ b/priv/tripe-privhelper.8.in @@ -27,7 +27,7 @@ .so ../common/defs.man \" @@@PRE@@@ . .\"-------------------------------------------------------------------------- -.TH tripe-privhelper 8 "28 April 2008" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" +.TH tripe-privhelper 8tripe "28 April 2008" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" . .\"-------------------------------------------------------------------------- .SH "NAME" diff --git a/proxy/Makefile.am b/proxy/Makefile.am index 0d4e516d..4aac1276 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -38,8 +38,8 @@ bin_PROGRAMS += tripe-mitm tripe_mitm_LDADD = $(catacomb_LIBS) tripe_mitm_SOURCES = tripe-mitm.c -man_MANS += tripe-mitm.8 -CLEANFILES += tripe-mitm.8 +man_MANS += tripe-mitm.8tripe +CLEANFILES += tripe-mitm.8tripe EXTRA_DIST += tripe-mitm.8.in ###----- That's all, folks -------------------------------------------------- diff --git a/proxy/tripe-mitm.8.in b/proxy/tripe-mitm.8.in index f9cea379..0d883dab 100644 --- a/proxy/tripe-mitm.8.in +++ b/proxy/tripe-mitm.8.in @@ -27,7 +27,7 @@ .so ../common/defs.man \" @@@PRE@@@ . .\"-------------------------------------------------------------------------- -.TH tripe-mitm 8 "14 October 2003" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" +.TH tripe-mitm 8tripe "14 October 2003" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" . .\"-------------------------------------------------------------------------- .SH "NAME" diff --git a/server/Makefile.am b/server/Makefile.am index ad5b4a98..3ca82d5f 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -58,13 +58,13 @@ tripe_SOURCES += tun-std.c tripe_SOURCES += tun-slip.c ## Server manual page. -man_MANS += tripe.8 -CLEANFILES += tripe.8 +man_MANS += tripe.8tripe +CLEANFILES += tripe.8tripe EXTRA_DIST += tripe.8.in ## The admin protocol manual page. -man_MANS += tripe-admin.5 -CLEANFILES += tripe-admin.5 +man_MANS += tripe-admin.5tripe +CLEANFILES += tripe-admin.5tripe EXTRA_DIST += tripe-admin.5.in ###----- That's all, folks -------------------------------------------------- diff --git a/server/tripe-admin.5.in b/server/tripe-admin.5.in index 4ede9065..edd56779 100644 --- a/server/tripe-admin.5.in +++ b/server/tripe-admin.5.in @@ -27,7 +27,7 @@ .so ../common/defs.man \" @@@PRE@@@ . .\"-------------------------------------------------------------------------- -.TH tripe-admin 5 "18 February 2001" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" +.TH tripe-admin 5tripe "18 February 2001" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" . .\"-------------------------------------------------------------------------- .SH "NAME" diff --git a/server/tripe.8.in b/server/tripe.8.in index 854b3a0a..fd0209d7 100644 --- a/server/tripe.8.in +++ b/server/tripe.8.in @@ -27,7 +27,7 @@ .so ../common/defs.man \" @@@PRE@@@ . .\"-------------------------------------------------------------------------- -.TH tripe 8 "10 February 2001" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" +.TH tripe 8tripe "10 February 2001" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" . .\"-------------------------------------------------------------------------- .SH "NAME" diff --git a/svc/Makefile.am b/svc/Makefile.am index a695e14a..d60c49b1 100644 --- a/svc/Makefile.am +++ b/svc/Makefile.am @@ -34,8 +34,8 @@ man_MANS = ### Services. ## Services manual page. -man_MANS += tripe-service.7 -CLEANFILES += tripe-service.7 +man_MANS += tripe-service.7tripe +CLEANFILES += tripe-service.7tripe EXTRA_DIST += tripe-service.7.in ## Handle dynamic connections. @@ -43,8 +43,8 @@ services_SCRIPTS += connect CLEANFILES += connect EXTRA_DIST += connect.in -man_MANS += connect.8 -CLEANFILES += connect.8 +man_MANS += connect.8tripe +CLEANFILES += connect.8tripe EXTRA_DIST += connect.8.in connect: connect.in Makefile @@ -56,8 +56,8 @@ services_SCRIPTS += conntrack CLEANFILES += conntrack EXTRA_DIST += conntrack.in -man_MANS += conntrack.8 -CLEANFILES += conntrack.8 +man_MANS += conntrack.8tripe +CLEANFILES += conntrack.8tripe EXTRA_DIST += conntrack.8.in conntrack: conntrack.in Makefile @@ -69,8 +69,8 @@ sbin_SCRIPTS = tripe-ifup CLEANFILES += tripe-ifup EXTRA_DIST += tripe-ifup.in -man_MANS += tripe-ifup.8 -CLEANFILES += tripe-ifup.8 +man_MANS += tripe-ifup.8tripe +CLEANFILES += tripe-ifup.8tripe EXTRA_DIST += tripe-ifup.8.in tripe-ifup: tripe-ifup.in Makefile diff --git a/svc/connect.8.in b/svc/connect.8.in index f06c1a2e..468a5c6d 100644 --- a/svc/connect.8.in +++ b/svc/connect.8.in @@ -27,7 +27,7 @@ .so ../defs.man.in \"@@@PRE@@@ . .\"-------------------------------------------------------------------------- -.TH connect 8 "11 December 2007" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" +.TH connect 8tripe "11 December 2007" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" . .\"-------------------------------------------------------------------------- .SH "NAME" diff --git a/svc/conntrack.8.in b/svc/conntrack.8.in index dd146f20..316639bf 100644 --- a/svc/conntrack.8.in +++ b/svc/conntrack.8.in @@ -27,7 +27,7 @@ .so ../common/defs.man \"@@@PRE@@@ . .\"-------------------------------------------------------------------------- -.TH conntrack 8 "8 January 2007" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" +.TH conntrack 8tripe "8 January 2007" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" . .\"-------------------------------------------------------------------------- .SH "NAME" diff --git a/svc/tripe-ifup.8.in b/svc/tripe-ifup.8.in index f9a783cc..a661214a 100644 --- a/svc/tripe-ifup.8.in +++ b/svc/tripe-ifup.8.in @@ -27,7 +27,7 @@ .so ../defs.man.in \"@@@PRE@@@ . .\"-------------------------------------------------------------------------- -.TH tripe-ifup 8 "20 December 2008" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" +.TH tripe-ifup 8tripe "20 December 2008" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" . .\"-------------------------------------------------------------------------- .SH "NAME" diff --git a/svc/tripe-service.7.in b/svc/tripe-service.7.in index 56d9670d..23272ea7 100644 --- a/svc/tripe-service.7.in +++ b/svc/tripe-service.7.in @@ -27,7 +27,7 @@ .so ../defs.man.in \"@@@PRE@@@ . .\"-------------------------------------------------------------------------- -.TH tripe-service 7 "8 January 2007" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" +.TH tripe-service 7tripe "8 January 2007" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" . .\"-------------------------------------------------------------------------- .SH "NAME" diff --git a/uslip/Makefile.am b/uslip/Makefile.am index d7228578..cfdfc2e9 100644 --- a/uslip/Makefile.am +++ b/uslip/Makefile.am @@ -38,8 +38,8 @@ bin_PROGRAMS += tripe-uslip tripe_uslip_SOURCES = uslip.c ## Docuemntation. -man_MANS += tripe-uslip.1 -CLEANFILES += tripe-uslip.1 +man_MANS += tripe-uslip.1tripe +CLEANFILES += tripe-uslip.1tripe EXTRA_DIST += tripe-uslip.1.in ###----- That's all, folks -------------------------------------------------- diff --git a/uslip/tripe-uslip.1.in b/uslip/tripe-uslip.1.in index b607c394..e0c75de3 100644 --- a/uslip/tripe-uslip.1.in +++ b/uslip/tripe-uslip.1.in @@ -27,7 +27,7 @@ .so ../common/defs.man \" @@@PRE@@@ . .\"-------------------------------------------------------------------------- -.TH tripe-uslip 1 "7 April 2008" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" +.TH tripe-uslip 1tripe "7 April 2008" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption" . .\"-------------------------------------------------------------------------- .SH "NAME" diff --git a/vars.am b/vars.am index f7d3eff8..093e1728 100644 --- a/vars.am +++ b/vars.am @@ -74,10 +74,10 @@ SUBST = $(V_SUBST)$(confsubst) ###-------------------------------------------------------------------------- ### Manpage substitutions. -SUFFIXES += .1 .1.in -SUFFIXES += .5 .5.in -SUFFIXES += .7 .7.in -SUFFIXES += .8 .8.in +SUFFIXES += .1tripe .1.in .1 +SUFFIXES += .5tripe .5.in +SUFFIXES += .7tripe .7.in +SUFFIXES += .8tripe .8.in mandefs = $(top_srcdir)/common/defs.man makesummary = $(top_srcdir)/common/make-summary @@ -86,7 +86,7 @@ V_MAN = $(V_MAN_$(V)) V_MAN_ = $(V_MAN_$(AM_DEFAULT_VERBOSITY)) V_MAN_0 = @echo " MAN $@"; -.1.in.1 .5.in.5 .7.in.7 .8.in.8: +.1.in.1 .1.in.1tripe .5.in.5tripe .7.in.7tripe .8.in.8tripe: $(V_MAN) $(AM_V_at)sed '/^\.$$/ d; /^\.\\"/ d' $(mandefs) >$@.defs $(AM_V_at)sed -e '/@@@PRE@@@/ {' -e 'r$@.defs' -e 'd' -e '}' \