Fix some format and other varargs errors.

[tripe] / svc / Makefile.am

diff --git a/svc/Makefile.am b/svc/Makefile.am
index 3e392b4e25c47ee57e302ad61b5e1395c0b76b66..121df6dfde97d10ce8e97d4d1b437247e0e4576f 100644 (file)
--- a/svc/Makefile.am
+++ b/svc/Makefile.am
@@ -48,7 +48,7 @@ CLEANFILES            += connect.8
 EXTRA_DIST             += connect.8.in
 
 connect: connect.in Makefile
-       $(confsubst) $(srcdir)/connect.in >$@.new $(SUBSTITUTIONS) && \
+       $(SUBST) $(srcdir)/connect.in >$@.new $(SUBSTITUTIONS) && \
                chmod +x $@.new && mv $@.new $@
 
 ## Watch for peers arriving and disconnecting.
@@ -61,7 +61,20 @@ CLEANFILES           += watch.8
 EXTRA_DIST             += watch.8.in
 
 watch: watch.in Makefile
-       $(confsubst) $(srcdir)/watch.in >$@.new $(SUBSTITUTIONS) && \
+       $(SUBST) $(srcdir)/watch.in >$@.new $(SUBSTITUTIONS) && \
+               chmod +x $@.new && mv $@.new $@
+
+## Watch D-Bus to keep track of external connectivity.
+services_SCRIPTS       += conntrack
+CLEANFILES             += conntrack
+EXTRA_DIST             += conntrack.in
+
+man_MANS               += conntrack.8
+CLEANFILES             += conntrack.8
+EXTRA_DIST             += conntrack.8.in
+
+conntrack: conntrack.in Makefile
+       $(SUBST) $(srcdir)/conntrack.in >$@.new $(SUBSTITUTIONS) && \
                chmod +x $@.new && mv $@.new $@
 
 ## Bring up an interface.
@@ -74,7 +87,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 --------------------------------------------------