forked from extern/shorewall_code
More LIBEXEC/PERLLIB fixes
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
7994c82c1b
commit
9ba9d40b77
@ -363,7 +363,7 @@ compiler() {
|
|||||||
PERL=/usr/bin/perl
|
PERL=/usr/bin/perl
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $g_perllib = share/shorewall ]; then
|
if [ $g_perllib = ${g_libexec}/shorewall ]; then
|
||||||
$PERL $debugflags $g_libexec/shorewall/compiler.pl $options $@
|
$PERL $debugflags $g_libexec/shorewall/compiler.pl $options $@
|
||||||
else
|
else
|
||||||
PERL5LIB=$g_perllib
|
PERL5LIB=$g_perllib
|
||||||
@ -1595,8 +1595,8 @@ CONFDIR=/etc/shorewall
|
|||||||
g_product="Shorewall"
|
g_product="Shorewall"
|
||||||
g_recovering=
|
g_recovering=
|
||||||
g_timestamp=
|
g_timestamp=
|
||||||
g_libexec=/usr/share/shorewall
|
g_libexec=/usr/share
|
||||||
g_perllib=share/shorewall
|
g_perllib=/usr/share/shorewall
|
||||||
|
|
||||||
[ -f ${CONFDIR}/vardir ] && . ${CONFDIR}/vardir
|
[ -f ${CONFDIR}/vardir ] && . ${CONFDIR}/vardir
|
||||||
|
|
||||||
|
@ -300,7 +300,7 @@ compiler() {
|
|||||||
PERL=/usr/bin/perl
|
PERL=/usr/bin/perl
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $g_perllib = /usr/share/shorewall ]; then
|
if [ $g_perllib = ${g_libexec}/shorewall ]; then
|
||||||
$command $PERL $debugflags $pc $options $@
|
$command $PERL $debugflags $pc $options $@
|
||||||
else
|
else
|
||||||
PERL5LIB=$g_perllib
|
PERL5LIB=$g_perllib
|
||||||
|
Loading…
Reference in New Issue
Block a user