From ceecf29535f53d4111d231bd56a4a48a098259a9 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Thu, 12 May 2011 07:45:54 -0700 Subject: [PATCH] More LIBEXEC/PERLLIB fixes Signed-off-by: Tom Eastep --- Shorewall/shorewall | 2 +- Shorewall6/shorewall6 | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Shorewall/shorewall b/Shorewall/shorewall index a7e55ac96..04fdd7296 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 PERL5LIB=/usr/$g_perllib export PERL5LIB fi diff --git a/Shorewall6/shorewall6 b/Shorewall6/shorewall6 index 452cd8f52..15b80555a 100755 --- a/Shorewall6/shorewall6 +++ b/Shorewall6/shorewall6 @@ -300,13 +300,12 @@ compiler() { PERL=/usr/bin/perl fi - if [ $g_perllib = share/shorewall ]; then - $PERL $debugflags $pc $options $@ - else + if [ $g_perllib != ${g_libexec}/shorewall ]; then PERL5LIB=$g_perllib export PERL5LIB - $command $PERL $debugflags $pc $options $@ fi + + $command $PERL $debugflags $pc $options $@ } #