svc/conntrack.in: Update NetworkManager protocol handling.

[tripe] / svc / Makefile.am

diff --git a/svc/Makefile.am b/svc/Makefile.am
index ffe74d0..a695e14 100644 (file)
--- a/svc/Makefile.am
+++ b/svc/Makefile.am
@@ -48,20 +48,7 @@ CLEANFILES           += connect.8
 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.
@@ -74,7 +61,7 @@ CLEANFILES            += conntrack.8
 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.
@@ -87,8 +74,7 @@ CLEANFILES            += tripe-ifup.8
 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 --------------------------------------------------
-