From 9ba9d40b77d5ead2610070b0c19bda263d765b69 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Thu, 12 May 2011 07:42:09 -0700
Subject: [PATCH] More LIBEXEC/PERLLIB fixes

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/shorewall   | 6 +++---
 Shorewall6/shorewall6 | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index df475ffd7..165cb3d64 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -363,7 +363,7 @@ compiler() {
 	PERL=/usr/bin/perl
     fi
 
-    if [ $g_perllib = share/shorewall ]; then
+    if [ $g_perllib = ${g_libexec}/shorewall ]; then
 	$PERL $debugflags $g_libexec/shorewall/compiler.pl $options $@
     else
 	PERL5LIB=$g_perllib
@@ -1595,8 +1595,8 @@ CONFDIR=/etc/shorewall
 g_product="Shorewall"
 g_recovering=
 g_timestamp=
-g_libexec=/usr/share/shorewall
-g_perllib=share/shorewall
+g_libexec=/usr/share
+g_perllib=/usr/share/shorewall
 
 [ -f ${CONFDIR}/vardir ] && . ${CONFDIR}/vardir
 
diff --git a/Shorewall6/shorewall6 b/Shorewall6/shorewall6
index 85c9fbc69..99824429a 100755
--- a/Shorewall6/shorewall6
+++ b/Shorewall6/shorewall6
@@ -300,7 +300,7 @@ compiler() {
 	PERL=/usr/bin/perl
     fi
 
-    if [ $g_perllib = /usr/share/shorewall ]; then
+    if [ $g_perllib = ${g_libexec}/shorewall ]; then
 	$command $PERL $debugflags $pc $options $@
     else
 	PERL5LIB=$g_perllib