More LIBEXEC/PERLLIB fixes

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-05-12 07:42:09 -07:00
parent 7994c82c1b
commit 9ba9d40b77
2 changed files with 4 additions and 4 deletions

View File

@ -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

View File

@ -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