From 7d50ec1236bcc8fd33a54997655d5a087048d0c1 Mon Sep 17 00:00:00 2001
Message-Id: <7d50ec1236bcc8fd33a54997655d5a087048d0c1.1714508335.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sat, 11 Feb 2012 14:39:46 +0000
Subject: [PATCH] zoneconf-install-*: Find `zoneconf' in the correct place.
Organization: Straylight/Edgeware

From: Mark Wooding <mdw@distorted.org.uk>

This means we have to substitute in them, so the Makefile hacking is
more significant than the actual code change.
---
 Makefile.am                                    | 18 ++++++++++++++++--
 ...conf-install-ssh => zoneconf-install-ssh.in |  2 +-
 ...-install-userv => zoneconf-install-userv.in |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)
 rename zoneconf-install-ssh => zoneconf-install-ssh.in (70%)
 rename zoneconf-install-userv => zoneconf-install-userv.in (64%)

diff --git a/Makefile.am b/Makefile.am
index a26d686..07a7368 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,7 +65,14 @@ zoneconf: zoneconf.in Makefile
 
 ## Userv interface.
 sbin_SCRIPTS		+= zoneconf-install-userv
-EXTRA_DIST		+= zoneconf-install-userv
+EXTRA_DIST		+= zoneconf-install-userv.in
+CLEANFILES		+= zoneconf-install-userv
+
+zoneconf-install-userv: zoneconf-install-userv.in Makefile
+	$(SUBST) $(srcdir)/zoneconf-install-userv.in $(SUBSTITUTIONS) \
+			>zoneconf-install-userv.new && \
+		chmod +x zoneconf-install-userv.new && \
+		mv zoneconf-install-userv.new zoneconf-install-userv
 
 noinst_DATA		+= userv.rc
 EXTRA_DIST		+= userv.rc.in
@@ -76,7 +83,14 @@ userv.rc: userv.rc.in Makefile
 
 ## SSH interface.
 sbin_SCRIPTS		+= zoneconf-install-ssh
-EXTRA_DIST		+= zoneconf-install-ssh
+EXTRA_DIST		+= zoneconf-install-ssh.in
+CLEANFILES		+= zoneconf-install-ssh
+
+zoneconf-install-ssh: zoneconf-install-ssh.in Makefile
+	$(SUBST) $(srcdir)/zoneconf-install-ssh.in $(SUBSTITUTIONS) \
+			>zoneconf-install-ssh.new && \
+		chmod +x zoneconf-install-ssh.new && \
+		mv zoneconf-install-ssh.new zoneconf-install-ssh
 
 ###--------------------------------------------------------------------------
 ### Distribution.
diff --git a/zoneconf-install-ssh b/zoneconf-install-ssh.in
similarity index 70%
rename from zoneconf-install-ssh
rename to zoneconf-install-ssh.in
index 0e323b9..7b06bba 100755
--- a/zoneconf-install-ssh
+++ b/zoneconf-install-ssh.in
@@ -8,4 +8,4 @@ case $# in
 esac
 
 view="$1" zone="$2"
-exec bin/zoneconf install "$SSH_USER" "$view" "$zone"
+exec @sbindir@/zoneconf install "$SSH_USER" "$view" "$zone"
diff --git a/zoneconf-install-userv b/zoneconf-install-userv.in
similarity index 64%
rename from zoneconf-install-userv
rename to zoneconf-install-userv.in
index c81faa8..79f7242 100755
--- a/zoneconf-install-userv
+++ b/zoneconf-install-userv.in
@@ -7,4 +7,4 @@ case $# in
 esac
 
 view="$1" zone="$2"
-exec bin/zoneconf install "$USERV_USER" "$view" "$zone"
+exec @sbindir@/zoneconf install "$USERV_USER" "$view" "$zone"
-- 
[mdw]