Merge branch 'master' of ssh://server.shorewall.net/home/teastep/shorewall/code

This commit is contained in:
Tom Eastep 2015-06-22 12:23:53 -07:00
commit fad92be473

View File

@ -387,8 +387,6 @@ compiler() {
#
get_config Yes
[ -n "$g_doing" ] && progress_message3 "$g_doing..."
case $COMMAND in
*start|try|refresh)
;;
@ -448,12 +446,12 @@ compiler() {
PERL=/usr/bin/perl
fi
[ -n "$g_doing" ] && progress_message3 "$g_doing..."
if [ ${PERLLIBDIR} = ${LIBEXECDIR}/shorewall ]; then
$PERL $debugflags $pc $options $@
else
PERL5LIB=${PERLLIBDIR}
export PERL5LIB
$PERL $debugflags $pc $options $@
PERL5LIB=${PERLLIBDIR} $PERL $debugflags $pc $options $@
fi
}