From 47b834b048d10e2d93bb774b89b36d6e29c846a5 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Fri, 9 Jun 2006 17:04:26 +0000
Subject: [PATCH] Allow Shorewall and Shorewall-lite to coexist on a system -
 Take 2

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4036 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/install.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 89e7fb06c..241bbd065 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -223,10 +223,6 @@ else
     first_install="Yes"
 fi
 
-install_file_with_backup shorewall ${PREFIX}/sbin/shorewall 0555 ${PREFIX}/var/lib/shorewall-${VERSION}.bkout
-
-echo "shorewall control program installed in ${PREFIX}/sbin/shorewall"
-
 #
 # Install the Firewall Script
 #
@@ -276,6 +272,16 @@ if [ ! -f ${PREFIX}/etc/shorewall/zones ]; then
     run_install $OWNERSHIP -m 0744 zones ${PREFIX}/etc/shorewall/zones
     echo "Zones file installed as ${PREFIX}/etc/shorewall/zones"
 fi
+#
+# Install control program
+#
+if [ -n "$PREFIX" ]; then
+    install_file shorewall ${PREFIX}/usr/share/shorewall/shorewall 0555
+    echo "shorewall control program installed in ${PREFIX}/usr/share/shorewall/shorewall"
+else
+    install_file_with_backup shorewall ${PREFIX}/sbin/shorewall 0555 ${PREFIX}/var/lib/shorewall-${VERSION}.bkout
+    echo "shorewall control program installed in ${PREFIX}/sbin/shorewall"
+fi
 
 #
 # Install the functions file