4 files changed, 92 insertions, 76 deletions
diff --git a/contrib/debian/bbackupd b/contrib/debian/bbackupd
deleted file mode 100644
index e6d5326c..00000000
--- a/contrib/debian/bbackupd
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-
-# Start and stop the Box Backup client daemon.
-
-test -x /usr/local/bin/bbackupd || exit 0
-test -f /etc/box/bbackupd.conf || exit 0
-
-case $1 in
-	start)
-		echo -n "Starting Box Backup Client daemon: bbackupd"
-		start-stop-daemon --start --quiet --exec /usr/local/bin/bbackupd > /dev/null
-		echo "."
-		;;
-		
-	stop)
-		echo -n "Stopping Box Backup Client daemon: bbackupd"
-		start-stop-daemon --stop --quiet --pidfile /var/run/bbackupd.pid --exec /usr/local/bin/bbackupd
-		echo "."
-		;;
-	
-	reload|force-reload)
-		echo -n "Reloading the Box Backup Client daemon's configuration"
-		start-stop-daemon --stop --signal 1 --quiet --oknodo --pidfile /var/run/bbackupd.pid --exec /usr/local/bin/bbackupd
-		echo "."
-		;;
-		
-	restart)
-		echo -n "Restarting the Box Backup Client daemon: bbackupd"	
-		start-stop-daemon --stop --quiet --pidfile /var/run/bbackupd.pid --exec /usr/local/bin/bbackupd
-		start-stop-daemon --start --quiet --exec /usr/local/bin/bbackupd > dev/null
-		echo "."
-		;;
-	*)
-		echo "Usage: /etc/init.d/bbackupd {start|stop|reload|force-reload|restart}"
-		exit 1
-esac
-
-exit 0
diff --git a/contrib/debian/bbackupd.in b/contrib/debian/bbackupd.in
new file mode 100644
index 00000000..78d4f4ee
--- /dev/null
+++ b/contrib/debian/bbackupd.in
@@ -0,0 +1,46 @@
+#! /bin/sh
+
+# Start and stop the Box Backup client daemon.
+
+BBACKUPD=@bindir_expanded@/bbackupd
+CONFIG=@sysconfdir_expanded@/box/bbackupd.conf
+PIDFILE=@localstatedir_expanded@/bbackupd.pid
+
+test -x $BBACKUPD || exit 0
+test -f $CONFIG || exit 0
+
+case $1 in
+	start)
+		echo -n "Starting Box Backup Client daemon: bbackupd"
+		start-stop-daemon --start --quiet --exec $BBACKUPD > /dev/null
+		echo "."
+		;;
+		
+	stop)
+		echo -n "Stopping Box Backup Client daemon: bbackupd"
+		start-stop-daemon --stop --quiet \
+			--pidfile $PIDFILE --exec $BBACKUPD
+		echo "."
+		;;
+	
+	reload|force-reload)
+		echo -n "Reloading Box Backup Client configuration"
+		start-stop-daemon --stop --signal 1 --quiet --oknodo \
+			--pidfile $PIDFILE --exec $BBACKUPD
+		echo "."
+		;;
+		
+	restart)
+		echo -n "Restarting Box Backup Client daemon: bbackupd"	
+		start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+			--exec $BBACKUPD
+		start-stop-daemon --start --quiet \
+			--exec $BBACKUPD > /dev/null
+		echo "."
+		;;
+	*)
+		echo "Usage: /etc/init.d/bbackupd {start|stop|reload|force-reload|restart}"
+		exit 1
+esac
+
+exit 0
diff --git a/contrib/debian/bbstored b/contrib/debian/bbstored
deleted file mode 100644
index 7a512161..00000000
--- a/contrib/debian/bbstored
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-
-# Start and stop the Box Backup Server.
-
-test -x /usr/local/bin/bbstored || exit 0
-test -f /etc/box/bbstored.conf || exit 0
-
-case $1 in
-	start)
-		echo -n "Starting the Box Backup Server daemon: bbstored"
-		start-stop-daemon --start --quiet --exec /usr/local/bin/bbstored > /dev/null
-		echo "."
-		;;
-	
-	stop)
-		echo -n "Stopping the Box Backup Server daemon: bbstored"
-		start-stop-daemon --stop --quiet --pidfile /var/run/bbstored.pid --exec /usr/local/bin/bbstored
-		echo "."
-		;;
-	
-	reload|force-reload)
-		echo -n "Reloading the Box Backup Server's configuration"
-			start-stop-daemon --stop --signal 1 --quiet --oknodo --pidfile /var/run/bbstored.pid --exec /usr/local/bin/bbstored
-		echo "."
-		;;
-	
-	restart)
-		echo -n "Restarting the Box Backup Server daemon: bbstored"
-		start-stop-daemon --stop --quiet --pidfile /var/run/bbstored.pid --exec /usr/local/bin/bbstored
-		start-stop-daemon --start --quiet --exec /usr/local/bin/bbstored > /dev/null
-		echo "."
-		;;
-	
-	*)
-		echo "Usage /etc/init.d/bbstored {start|stop|reload|force-reload|restart}"
-esac
-
-exit 0
diff --git a/contrib/debian/bbstored.in b/contrib/debian/bbstored.in
new file mode 100644
index 00000000..da6a50a0
--- /dev/null
+++ b/contrib/debian/bbstored.in
@@ -0,0 +1,46 @@
+#! /bin/sh
+
+# Start and stop the Box Backup server daemon.
+
+BBSTORED=@bindir_expanded@/bbstored
+CONFIG=@sysconfdir_expanded@/box/bbstored.conf
+PIDFILE=@localstatedir_expanded@/bbstored.pid
+
+test -x $BBACKUPD || exit 0
+test -f $CONFIG || exit 0
+
+case $1 in
+	start)
+		echo -n "Starting Box Backup Server daemon: bbstored"
+		start-stop-daemon --start --quiet --exec $BBSTORED > /dev/null
+		echo "."
+		;;
+	
+	stop)
+		echo -n "Stopping Box Backup Server daemon: bbstored"
+		start-stop-daemon --stop --quiet \
+			--pidfile $PIDFILE --exec $BBSTORED
+		echo "."
+		;;
+	
+	reload|force-reload)
+		echo -n "Reloading Box Backup Server configuration"
+		start-stop-daemon --stop --signal 1 --quiet --oknodo \
+			--pidfile $PIDFILE --exec $BBSTORED
+		echo "."
+		;;
+	
+	restart)
+		echo -n "Restarting Box Backup Server daemon: bbstored"
+		start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+			--exec $BBSTORED
+		start-stop-daemon --start --quiet \
+			--exec $BBSTORED > /dev/null
+		echo "."
+		;;
+	
+	*)
+		echo "Usage: /etc/init.d/bbstored {start|stop|reload|force-reload|restart}"
+esac
+
+exit 0