From 0ef4cd1653e773fe6b1cc3708b73593fd852d433 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 23 May 2010 16:10:36 -0700 Subject: [PATCH] Allow Debian install with PREFIX Signed-off-by: Tom Eastep --- Shorewall/install.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 638c1f27a..e894a089e 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -107,9 +107,6 @@ if [ -z "$RUNLEVELS" ] ; then RUNLEVELS="" fi -DEBIAN= -CYGWIN= -MAC= SPARSE= MANDIR=${MANDIR:-"/usr/share/man"} INSTALLD='-D' @@ -246,7 +243,7 @@ fi # Install the Firewall Script # if [ -n "$DEBIAN" ]; then - install_file init.debian.sh /etc/init.d/shorewall 0544 + install_file init.debian.sh ${PREFIX}/etc/init.d/shorewall 0544 elif [ -n "$ARCHLINUX" ]; then install_file init.archlinux.sh ${PREFIX}${DEST}/$INIT 0544 elif [ -n "$SLACKWARE" ]; then @@ -286,7 +283,7 @@ perl -p -w -i -e 's|^STARTUP_LOG=.*|STARTUP_LOG=/var/log/shorewall-lite-init.log if [ ! -f ${PREFIX}/etc/shorewall/shorewall.conf ]; then run_install $OWNERSHIP -m 0644 configfiles/shorewall.conf ${PREFIX}/etc/shorewall - if [ -n "$DEBIAN" ] && mywhich perl; then + if [ -n "$DEBIAN" ]; then # # Make a Debian-like shorewall.conf #