Expunge the g_perllib variable

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-10-01 06:59:39 -07:00
parent a8e9296473
commit 92d39dc56d
6 changed files with 2 additions and 7 deletions

View File

@ -39,7 +39,6 @@ if [ -z "$g_readrc" ]; then
. /usr/share/shorewall/shorewallrc
g_sharedir="$SHAREDIR"/$g_program
g_perllib="$PERLLIBDIR"
g_confdir="$CONFDIR"/$g_program
g_readrc=1
fi

View File

@ -31,7 +31,6 @@ if [ -z "$g_readrc" ]; then
. /usr/share/shorewall/shorewallrc
g_sharedir="$SHAREDIR"/$g_program
g_perllib="$PERLLIBDIR"
g_confdir="$CONFDIR"/$g_program
g_readrc=1
fi

View File

@ -40,7 +40,6 @@ fi
g_program=$PRODUCT
g_sharedir="$SHAREDIR/shorewall"
g_perllib="$PERLLIBDIR"
g_confdir="$CONFDIR/$PRODUCT"
g_readrc=1

View File

@ -430,10 +430,10 @@ compiler() {
PERL=/usr/bin/perl
fi
if [ $g_perllib = ${LIBEXECDIR}/shorewall ]; then
if [ ${PERLLIBDIR} = ${LIBEXECDIR}/shorewall ]; then
$PERL $debugflags $pc $options $@
else
PERL5LIB=$g_perllib
PERL5LIB=${PERLLIBDIR}
export PERL5LIB
$PERL $debugflags $pc $options $@
fi

View File

@ -34,7 +34,6 @@ PRODUCT=shorewall
g_program=$PRODUCT
g_sharedir="$SHAREDIR"/shorewall
g_perllib="$PERLLIBDIR"
g_confdir="$CONFDIR"/shorewall
g_readrc=1

View File

@ -34,7 +34,6 @@ PRODUCT=shorewall6
g_program=$PRODUCT
g_sharedir="$SHAREDIR"/shorewall6
g_perllib="$PERLLIBDIR"
g_confdir="$CONFDIR"/shorewall6
g_readrc=1