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 4e03c3be2cff4de63d85f8deb9ceadb250158c0b..61921370d3a86cb1003708f73e34b43f57264519 100644 (file)
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -38,8 +38,8 @@ bin_PROGRAMS          += tripectl
 tripectl_SOURCES        = tripectl.c
 
 ## Manual page.
 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 --------------------------------------------------
 EXTRA_DIST             += tripectl.1.in
 
 ###----- That's all, folks --------------------------------------------------

diff --git a/client/tripectl.1.in b/client/tripectl.1.in
index 33e56cc9ba5add643c8af6d98a8250aa40ed5be0..523b1f054c523caaea7599437315b84e022174ad 100644 (file)
--- a/client/tripectl.1.in
+++ b/client/tripectl.1.in
@@ -27,7 +27,7 @@
 .so ../common/defs.man \" @@@PRE@@@
 .
 .\"--------------------------------------------------------------------------
 .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"
 .
 .\"--------------------------------------------------------------------------
 .SH "NAME"

diff --git a/debian/tripe-keys.install b/debian/tripe-keys.install
index 06cc965e68f9b59b00347b3c6a320ab9da2a493d..6308b81db8f7fd1517450a2d8cab38cfd2883874 100644 (file)
--- a/debian/tripe-keys.install
+++ b/debian/tripe-keys.install
@@ -1,4 +1,4 @@
 debian/tmp/usr/sbin/tripe-keys
 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
 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 9bd42cbed500e85e7fb93584be386a0f80dd7f11..6d621d7d2ae033163f5b3705de1c9d43ed416e9c 100644 (file)
--- 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/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/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/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/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 9115b0ff7cb9016bcb571690d2df5c82b442e606..cccaa1b16917e2f8acf07bac69455d2bbe19bd18 100644 (file)
--- a/debian/tripe-uslip.install
+++ b/debian/tripe-uslip.install
@@ -1,2 +1,2 @@
 debian/tmp/usr/bin/tripe-uslip
 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 be519d8b363b0e693cffcf3beadebb7580284b42..d6a2b212a53640a96318fb83270e92cd88eea63c 100644 (file)
--- 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/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/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
 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 6a313db62626f9b489f2fc827284fd13f8350e97..d99a45649c838961553b7bd1be3849c0102085df 100644 (file)
--- a/debian/tripemon.install
+++ b/debian/tripemon.install
@@ -1,2 +1,2 @@
 debian/tmp/usr/bin/tripemon
 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 68a0d221344760e7f244fe172feccb2e00c9a21c..2c6b26bad70a9a229cda6716d7a45cde2594a4ab 100644 (file)
--- 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.
                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.
 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 f94f9687978db3c4e49ab4271552e4f4a701efdc..be6cc3da88481ed0c246b18125138ce9fe66c866 100644 (file)
--- a/keys/tripe-keys.8.in
+++ b/keys/tripe-keys.8.in
@@ -27,7 +27,7 @@
 .so ../common/defs.man \" @@@PRE@@@
 .
 .\"--------------------------------------------------------------------------
 .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"
 .
 .\"--------------------------------------------------------------------------
 .SH "NAME"

diff --git a/keys/tripe-keys.conf.5.in b/keys/tripe-keys.conf.5.in
index 468070a94af48eb83f4b782f58c194604b80b83f..49e360d26119c947812cc555cd8f94f8eaf0fdfc 100644 (file)
--- a/keys/tripe-keys.conf.5.in
+++ b/keys/tripe-keys.conf.5.in
@@ -27,7 +27,7 @@
 .so ../common/defs.man \" @@@PRE@@@
 .
 .\"--------------------------------------------------------------------------
 .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"
 .
 .\"--------------------------------------------------------------------------
 .SH "NAME"

diff --git a/mon/Makefile.am b/mon/Makefile.am
index 128c35e3e16bffd77662b6025094fb3610263118..d2a92e0b0d613c79a1d6652068138cfa68eaa164 100644 (file)
--- a/mon/Makefile.am
+++ b/mon/Makefile.am
@@ -41,8 +41,8 @@ tripemon: tripemon.in Makefile
                chmod +x $@.new && mv $@.new $@
 
 ## Manual page.
                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 --------------------------------------------------
 EXTRA_DIST             += tripemon.1.in
 
 ###----- That's all, folks --------------------------------------------------

diff --git a/mon/tripemon.1.in b/mon/tripemon.1.in
index cea91c6542866182f922185ff885b533f6b250b6..c87a424633d413b07eb87d1da481efff7de4260f 100644 (file)
--- a/mon/tripemon.1.in
+++ b/mon/tripemon.1.in
@@ -27,7 +27,7 @@
 .so ../common/defs.man \" @@@PRE@@@
 .
 .\"--------------------------------------------------------------------------
 .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"
 .
 .\"--------------------------------------------------------------------------
 .SH "NAME"

diff --git a/peerdb/Makefile.am b/peerdb/Makefile.am
index 3688a3f2c9e74fbc3f275f5e578f4dc0ff9a0c03..20e1430194f476d260e6137e9a982235e1471cd2 100644 (file)
--- 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.
                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
 
 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
 
 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.
 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 187de0f22622ab5419961d5e7b2773719da98168..09913adefc724bfdab513e7c21d4819a1f107391 100644 (file)
--- a/peerdb/peers.cdb.5.in
+++ b/peerdb/peers.cdb.5.in
@@ -27,7 +27,7 @@
 .so ../defs.man.in \"@@@PRE@@@
 .
 .\"--------------------------------------------------------------------------
 .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"
 .
 .\"--------------------------------------------------------------------------
 .SH "NAME"

diff --git a/peerdb/peers.in.5.in b/peerdb/peers.in.5.in
index c718fb11d627430ab32ddbdd8dbb6b6edfcd5378..9ce9561c3c60e01ae28a124bc78dcdc3235d29c1 100644 (file)
--- a/peerdb/peers.in.5.in
+++ b/peerdb/peers.in.5.in
@@ -27,7 +27,7 @@
 .so ../defs.man.in \"@@@PRE@@@
 .
 .\"--------------------------------------------------------------------------
 .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"
 .
 .\"--------------------------------------------------------------------------
 .SH "NAME"

diff --git a/peerdb/tripe-newpeers.8.in b/peerdb/tripe-newpeers.8.in
index 17d0055084b0522ac272859fa0462c695a0c3576..3fa4ccbfcdd50bd1cd29065df29b1e8d0ab1cd6f 100644 (file)
--- a/peerdb/tripe-newpeers.8.in
+++ b/peerdb/tripe-newpeers.8.in
@@ -27,7 +27,7 @@
 .so ../defs.man.in \"@@@PRE@@@
 .
 .\"--------------------------------------------------------------------------
 .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"
 .
 .\"--------------------------------------------------------------------------
 .SH "NAME"

diff --git a/priv/Makefile.am b/priv/Makefile.am
index e0a467695545a91d198df1713917b3774c8a5640..80b935d44663981e5902738a03ccbf0571ca5c69 100644 (file)
--- a/priv/Makefile.am
+++ b/priv/Makefile.am
@@ -49,8 +49,8 @@ libpriv_a_SOURCES     += comm.c
 tripe_privhelper_SOURCES = helper.c
 
 ## Manual page.
 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 --------------------------------------------------
 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 0d7d50d6d142b75ccd0d82dbd88438623ef07d2d..2837206984db8d7f320eb5c4e4e557bcd238d28e 100644 (file)
--- a/priv/tripe-privhelper.8.in
+++ b/priv/tripe-privhelper.8.in
@@ -27,7 +27,7 @@
 .so ../common/defs.man \" @@@PRE@@@
 .
 .\"--------------------------------------------------------------------------
 .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"
 .
 .\"--------------------------------------------------------------------------
 .SH "NAME"

diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 0d4e516d9ec68d193b2645795b8d3af892027d43..4aac1276ef008e2a8d5691e9bef2673b9c347134 100644 (file)
--- 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
 
 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 --------------------------------------------------
 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 f9cea37991ec31a74049b59a20443998c583bae4..0d883dabae3d9f305f8df0a569ba350ad98c1b82 100644 (file)
--- a/proxy/tripe-mitm.8.in
+++ b/proxy/tripe-mitm.8.in
@@ -27,7 +27,7 @@
 .so ../common/defs.man \" @@@PRE@@@
 .
 .\"--------------------------------------------------------------------------
 .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"
 .
 .\"--------------------------------------------------------------------------
 .SH "NAME"

diff --git a/server/Makefile.am b/server/Makefile.am
index ad5b4a98e6d530cb776c77fe13dc150ac4e0f8bb..3ca82d5f8d3484cac635bd1461f3f0f5b7bda0bc 100644 (file)
--- 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.
 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.
 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 --------------------------------------------------
 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 4ede906580c27d7809c07458729631f30637eda9..edd56779ca516daba35fd88f97b7700fdc7b3f92 100644 (file)
--- a/server/tripe-admin.5.in
+++ b/server/tripe-admin.5.in
@@ -27,7 +27,7 @@
 .so ../common/defs.man \" @@@PRE@@@
 .
 .\"--------------------------------------------------------------------------
 .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"
 .
 .\"--------------------------------------------------------------------------
 .SH "NAME"

diff --git a/server/tripe.8.in b/server/tripe.8.in
index 854b3a0a78672ec7febd0acf5e55c3ee564cf310..fd0209d728f82f861de8d1e43e760c5b2cae3131 100644 (file)
--- a/server/tripe.8.in
+++ b/server/tripe.8.in
@@ -27,7 +27,7 @@
 .so ../common/defs.man \" @@@PRE@@@
 .
 .\"--------------------------------------------------------------------------
 .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"
 .
 .\"--------------------------------------------------------------------------
 .SH "NAME"

diff --git a/svc/Makefile.am b/svc/Makefile.am
index a695e14a2c6fe77e104223900184c69dc07270a4..d60c49b165559c2964c886c9ebb07f3ca538a4e3 100644 (file)
--- a/svc/Makefile.am
+++ b/svc/Makefile.am
@@ -34,8 +34,8 @@ man_MANS               =
 ### Services.
 
 ## Services manual page.
 ### 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.
 EXTRA_DIST             += tripe-service.7.in
 
 ## Handle dynamic connections.


@@ -43,8 +43,8 @@ services_SCRIPTS      += connect
 CLEANFILES             += connect
 EXTRA_DIST             += connect.in
 
 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
 EXTRA_DIST             += connect.8.in
 
 connect: connect.in Makefile


@@ -56,8 +56,8 @@ services_SCRIPTS      += conntrack
 CLEANFILES             += conntrack
 EXTRA_DIST             += conntrack.in
 
 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
 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
 
 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
 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 f06c1a2e667da611d7b59494b5e65969663641d9..468a5c6d505e44b3689e3dbfa82c11451ec4112c 100644 (file)
--- a/svc/connect.8.in
+++ b/svc/connect.8.in
@@ -27,7 +27,7 @@
 .so ../defs.man.in \"@@@PRE@@@
 .
 .\"--------------------------------------------------------------------------
 .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"
 .
 .\"--------------------------------------------------------------------------
 .SH "NAME"

diff --git a/svc/conntrack.8.in b/svc/conntrack.8.in
index dd146f206c9369e986a97559a95ee33fe185c7ff..316639bf98f591ee7a80235dda8f778576e6ff9d 100644 (file)
--- a/svc/conntrack.8.in
+++ b/svc/conntrack.8.in
@@ -27,7 +27,7 @@
 .so ../common/defs.man \"@@@PRE@@@
 .
 .\"--------------------------------------------------------------------------
 .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"
 .
 .\"--------------------------------------------------------------------------
 .SH "NAME"

diff --git a/svc/tripe-ifup.8.in b/svc/tripe-ifup.8.in
index f9a783cc771a9aa9a73ac57cb1318d359cddc205..a661214ab6ee959bd16291723ebfe4b4e39bee1c 100644 (file)
--- a/svc/tripe-ifup.8.in
+++ b/svc/tripe-ifup.8.in
@@ -27,7 +27,7 @@
 .so ../defs.man.in \"@@@PRE@@@
 .
 .\"--------------------------------------------------------------------------
 .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"
 .
 .\"--------------------------------------------------------------------------
 .SH "NAME"

diff --git a/svc/tripe-service.7.in b/svc/tripe-service.7.in
index 56d9670db853f50b5f8392a8f585e17d7ed8e3b8..23272ea7a5e0b152115e9fb9e7c788dd97501167 100644 (file)
--- a/svc/tripe-service.7.in
+++ b/svc/tripe-service.7.in
@@ -27,7 +27,7 @@
 .so ../defs.man.in \"@@@PRE@@@
 .
 .\"--------------------------------------------------------------------------
 .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"
 .
 .\"--------------------------------------------------------------------------
 .SH "NAME"

diff --git a/uslip/Makefile.am b/uslip/Makefile.am
index d722857844846e66c49c9ea8f9855662dd5841f2..cfdfc2e9b0cf131564d0234c671162a715d1357f 100644 (file)
--- a/uslip/Makefile.am
+++ b/uslip/Makefile.am
@@ -38,8 +38,8 @@ bin_PROGRAMS          += tripe-uslip
 tripe_uslip_SOURCES     = uslip.c
 
 ## Docuemntation.
 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 --------------------------------------------------
 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 b607c39466134379003e35314725b35524e1c0d3..e0c75de3b0a50356e9e9e4fe534943f667eaa29a 100644 (file)
--- a/uslip/tripe-uslip.1.in
+++ b/uslip/tripe-uslip.1.in
@@ -27,7 +27,7 @@
 .so ../common/defs.man \" @@@PRE@@@
 .
 .\"--------------------------------------------------------------------------
 .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"
 .
 .\"--------------------------------------------------------------------------
 .SH "NAME"

diff --git a/vars.am b/vars.am
index f7d3eff8bbbbdd08689c6700a0e4176700759f20..093e17286c1da21b1d271328f1c6ee599c92016b 100644 (file)
--- a/vars.am
+++ b/vars.am
@@ -74,10 +74,10 @@ SUBST = $(V_SUBST)$(confsubst)
 ###--------------------------------------------------------------------------
 ### Manpage substitutions.
 
 ###--------------------------------------------------------------------------
 ### 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
 
 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    $@";
 
 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 '}' \
        $(V_MAN)
        $(AM_V_at)sed '/^\.$$/ d; /^\.\\"/ d' $(mandefs) >$@.defs
        $(AM_V_at)sed -e '/@@@PRE@@@/ {' -e 'r$@.defs' -e 'd' -e '}' \