From e4e18d21ed67f045b147fe13d80e148b0cc2a0dc Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Fri, 11 Jan 2008 21:54:33 +0000
Subject: Fix some syslogd pidfile and installing support scripts.

---
 init.d.BSD/syslogd     | 2 +-
 init.d.misc/Makefile   | 9 ++++-----
 init.d.misc/openvpn.in | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/init.d.BSD/syslogd b/init.d.BSD/syslogd
index 1a9ff3c0..9336a413 100644
--- a/init.d.BSD/syslogd
+++ b/init.d.BSD/syslogd
@@ -4,7 +4,7 @@
 
 command=/usr/sbin/syslogd
 command_args=${syslogd_args}
-pidfile=/var/run/syslog.pid
+pidfile=/var/run/syslogd.pid
 name="System Logger Daemon"
 
 depend()
diff --git a/init.d.misc/Makefile b/init.d.misc/Makefile
index 693f9134..a2be5470 100644
--- a/init.d.misc/Makefile
+++ b/init.d.misc/Makefile
@@ -14,12 +14,11 @@ VARBASE?=	/var
 all: ${OBJS} 
 
 .in:
-	sed -e s':@PREFIX@:${PREFIX}:' -e 's:@VARBASE@:${VARBASE}:' $< > $@
+	sed -e 's:@PREFIX@:${PREFIX}:' -e 's:@VARBASE@:${VARBASE}:' $< > $@
 
-install: all 
-	for x in ${OBJS}; do \
-		${INSTALL} work/$$x ${DESTDIR}${DIR}; \
-	done
+install: all
+	${INSTALL} -d ${DESTDIR}${DIR} 
+	${INSTALL} ${OBJS} ${DESTDIR}${DIR}
 
 clean:
 	rm -f ${OBJS}
diff --git a/init.d.misc/openvpn.in b/init.d.misc/openvpn.in
index 721ad23c..49cafe5c 100644
--- a/init.d.misc/openvpn.in
+++ b/init.d.misc/openvpn.in
@@ -5,7 +5,7 @@
 vpn=${SVCNAME#*.}
 name="OpenVPN"
 [ "${vpn}" != "openvpn" ] && name="${name} (${vpn})"
-command=@PREFIX/sbin/openvpn
+command=@PREFIX@/sbin/openvpn
 
 pidfile=@VARBASE@/run/"${SVCNAME}".pid
 openvpn_dir=${openvpn_dir:-@PREFIX@/etc/openvpn}
-- 
cgit v1.2.3