mirror of
https://gitlab.com/shorewall/code.git
synced 2025-01-03 03:59:16 +01:00
Expunge the g_perllib variable
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
a8e9296473
commit
92d39dc56d
@ -39,7 +39,6 @@ if [ -z "$g_readrc" ]; then
|
|||||||
. /usr/share/shorewall/shorewallrc
|
. /usr/share/shorewall/shorewallrc
|
||||||
|
|
||||||
g_sharedir="$SHAREDIR"/$g_program
|
g_sharedir="$SHAREDIR"/$g_program
|
||||||
g_perllib="$PERLLIBDIR"
|
|
||||||
g_confdir="$CONFDIR"/$g_program
|
g_confdir="$CONFDIR"/$g_program
|
||||||
g_readrc=1
|
g_readrc=1
|
||||||
fi
|
fi
|
||||||
|
@ -31,7 +31,6 @@ if [ -z "$g_readrc" ]; then
|
|||||||
. /usr/share/shorewall/shorewallrc
|
. /usr/share/shorewall/shorewallrc
|
||||||
|
|
||||||
g_sharedir="$SHAREDIR"/$g_program
|
g_sharedir="$SHAREDIR"/$g_program
|
||||||
g_perllib="$PERLLIBDIR"
|
|
||||||
g_confdir="$CONFDIR"/$g_program
|
g_confdir="$CONFDIR"/$g_program
|
||||||
g_readrc=1
|
g_readrc=1
|
||||||
fi
|
fi
|
||||||
|
@ -40,7 +40,6 @@ fi
|
|||||||
|
|
||||||
g_program=$PRODUCT
|
g_program=$PRODUCT
|
||||||
g_sharedir="$SHAREDIR/shorewall"
|
g_sharedir="$SHAREDIR/shorewall"
|
||||||
g_perllib="$PERLLIBDIR"
|
|
||||||
g_confdir="$CONFDIR/$PRODUCT"
|
g_confdir="$CONFDIR/$PRODUCT"
|
||||||
g_readrc=1
|
g_readrc=1
|
||||||
|
|
||||||
|
@ -430,10 +430,10 @@ compiler() {
|
|||||||
PERL=/usr/bin/perl
|
PERL=/usr/bin/perl
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $g_perllib = ${LIBEXECDIR}/shorewall ]; then
|
if [ ${PERLLIBDIR} = ${LIBEXECDIR}/shorewall ]; then
|
||||||
$PERL $debugflags $pc $options $@
|
$PERL $debugflags $pc $options $@
|
||||||
else
|
else
|
||||||
PERL5LIB=$g_perllib
|
PERL5LIB=${PERLLIBDIR}
|
||||||
export PERL5LIB
|
export PERL5LIB
|
||||||
$PERL $debugflags $pc $options $@
|
$PERL $debugflags $pc $options $@
|
||||||
fi
|
fi
|
||||||
|
@ -34,7 +34,6 @@ PRODUCT=shorewall
|
|||||||
|
|
||||||
g_program=$PRODUCT
|
g_program=$PRODUCT
|
||||||
g_sharedir="$SHAREDIR"/shorewall
|
g_sharedir="$SHAREDIR"/shorewall
|
||||||
g_perllib="$PERLLIBDIR"
|
|
||||||
g_confdir="$CONFDIR"/shorewall
|
g_confdir="$CONFDIR"/shorewall
|
||||||
g_readrc=1
|
g_readrc=1
|
||||||
|
|
||||||
|
@ -34,7 +34,6 @@ PRODUCT=shorewall6
|
|||||||
|
|
||||||
g_program=$PRODUCT
|
g_program=$PRODUCT
|
||||||
g_sharedir="$SHAREDIR"/shorewall6
|
g_sharedir="$SHAREDIR"/shorewall6
|
||||||
g_perllib="$PERLLIBDIR"
|
|
||||||
g_confdir="$CONFDIR"/shorewall6
|
g_confdir="$CONFDIR"/shorewall6
|
||||||
g_readrc=1
|
g_readrc=1
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user