X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/2ec904370c028570277cb1d88405e7ab68e71f50..fa59a04b4daaa8d75e1fb0e875ed6ed5fb6d1304:/svc/Makefile.am

diff --git a/svc/Makefile.am b/svc/Makefile.am
index ffe74d0b..2b73ebef 100644
--- a/svc/Makefile.am
+++ b/svc/Makefile.am
@@ -9,19 +9,18 @@
 ###
 ### This file is part of Trivial IP Encryption (TrIPE).
 ###
-### TrIPE is free software; you can redistribute it and/or modify
-### it under the terms of the GNU General Public License as published by
-### the Free Software Foundation; either version 2 of the License, or
-### (at your option) any later version.
+### TrIPE is free software: you can redistribute it and/or modify it under
+### the terms of the GNU General Public License as published by the Free
+### Software Foundation; either version 3 of the License, or (at your
+### option) any later version.
 ###
-### TrIPE is distributed in the hope that it will be useful,
-### but WITHOUT ANY WARRANTY; without even the implied warranty of
-### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-### GNU General Public License for more details.
+### TrIPE is distributed in the hope that it will be useful, but WITHOUT
+### ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+### FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+### for more details.
 ###
 ### You should have received a copy of the GNU General Public License
-### along with TrIPE; if not, write to the Free Software Foundation,
-### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+### along with TrIPE.  If not, see <https://www.gnu.org/licenses/>.
 
 include $(top_srcdir)/vars.am
 
@@ -33,35 +32,17 @@ man_MANS		 =
 ###--------------------------------------------------------------------------
 ### Services.
 
-## Services manual page.
-man_MANS		+= tripe-service.7
-CLEANFILES		+= tripe-service.7
-EXTRA_DIST		+= tripe-service.7.in
-
 ## Handle dynamic connections.
 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
-	$(confsubst) $(srcdir)/connect.in >$@.new $(SUBSTITUTIONS) && \
-		chmod +x $@.new && mv $@.new $@
-
-## Watch for peers arriving and disconnecting.
-services_SCRIPTS	+= watch
-CLEANFILES		+= watch
-EXTRA_DIST		+= watch.in
-
-man_MANS		+= watch.8
-CLEANFILES		+= watch.8
-EXTRA_DIST		+= watch.8.in
-
-watch: watch.in Makefile
-	$(confsubst) $(srcdir)/watch.in >$@.new $(SUBSTITUTIONS) && \
+	$(SUBST) $(srcdir)/connect.in >$@.new $(SUBSTITUTIONS) && \
 		chmod +x $@.new && mv $@.new $@
 
 ## Watch D-Bus to keep track of external connectivity.
@@ -69,12 +50,12 @@ 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
-	$(confsubst) $(srcdir)/conntrack.in >$@.new $(SUBSTITUTIONS) && \
+	$(SUBST) $(srcdir)/conntrack.in >$@.new $(SUBSTITUTIONS) && \
 		chmod +x $@.new && mv $@.new $@
 
 ## Bring up an interface.
@@ -82,13 +63,12 @@ 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
-	$(confsubst) $(srcdir)/tripe-ifup.in >$@.new $(SUBSTITUTIONS) && \
+	$(SUBST) $(srcdir)/tripe-ifup.in >$@.new $(SUBSTITUTIONS) && \
 		chmod +x $@.new && mv $@.new $@
 
 ###----- That's all, folks --------------------------------------------------
-