From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 16 Mar 2012 00:15:38 +0000 (+0000)
Subject: contrib: Do proper substitutions on contrib files.
X-Git-Tag: 1.0.0pre11~33
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/commitdiff_plain/01c94fa1b6e5db0dd2b1c6d05f1f598c21fe493d

contrib: Do proper substitutions on contrib files.
---

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index fe5b4727..5d713137 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -25,12 +25,22 @@
 
 include $(top_srcdir)/vars.am
 
-dist_noinst_DATA	 =
+noinst_DATA		 =
 
 ###--------------------------------------------------------------------------
 ### Contributions.
 
 ## Glue for `userv-ipif'.
-dist_noinst_DATA	+= tripe-ipif ipif-peers
+noinst_DATA		+= tripe-ipif ipif-peers
+EXTRA_DIST		+= tripe-ipif.in ipif-peers.in
+CLEANFILES		+= tripe-ipif ipif-peers
+
+tripe-ipif: tripe-ipif.in Makefile
+	$(SUBST) $(srcdir)/tripe-ipif.in >$@.new $(SUBSTITUTIONS) && \
+		mv $@.new $@
+
+ipif-peers: ipif-peers.in Makefile
+	$(SUBST) $(srcdir)/ipif-peers.in >$@.new $(SUBSTITUTIONS) && \
+		mv $@.new $@
 
 ###----- That's all, folks --------------------------------------------------
diff --git a/contrib/ipif-peers b/contrib/ipif-peers.in
similarity index 95%
rename from contrib/ipif-peers
rename to contrib/ipif-peers.in
index c9762384..3b95a48a 100755
--- a/contrib/ipif-peers
+++ b/contrib/ipif-peers.in
@@ -32,10 +32,7 @@
 
 set -e
 quis=${0##*/}
-case ${TRIPEDIR+t} in
-  t) ;;
-  *) echo >&2 "$quis: \`TRIPEDIR' unset"; exit 1 ;;
-esac
+: ${TRIPEDIR=@configdir@}
 
 ## Trundle through the table.
 while read name remote_ext local_int remote_int routes; do
diff --git a/contrib/tripe-ipif b/contrib/tripe-ipif.in
similarity index 97%
rename from contrib/tripe-ipif
rename to contrib/tripe-ipif.in
index 689957c8..5a620faf 100755
--- a/contrib/tripe-ipif
+++ b/contrib/tripe-ipif.in
@@ -59,6 +59,9 @@
 
 set -e
 quis=${0##*/}
+: ${TRIPEDIR=@configdir@}
+: ${logfile=@logfile@}
+: ${TRIPE_IPIF_LOG=${logfile%/*}/tripe-ipif.log}
 
 ## Parse the command line.
 case $# in 1) ;; *) echo >&2 "Usage: $quis PEER"; exit 1 ;; esac
@@ -69,7 +72,7 @@ esac
 peer=$1
 
 ## Arrange for errors to go somewhere.
-case "${TRIPE_IPIF_LOG+t}" in t) exec 2>>"$TRIPE_IPIF_LOG" ;; esac
+exec 2>>"$TRIPE_IPIF_LOG"
 now=$(date +"%Y-%m-%d %H:%M:%S")
 echo >&2 "$now $quis[$$] running for peer \`$peer'"