holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Avoid dependence on 'make'

Browse Source
This commit is contained in:
Tom Eastep 2011-05-22 09:47:57 -07:00
parent a8fd3281d9
commit db6091f101
2 changed files with 36 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Shorewall/shorewall
View File

@ -309,6 +309,13 @@ startup_error() {
exit 1
}
#
# Determine if there are config files newer than the passed object
#
upofdate() {
[ -z "$(find ${CONFDIR} -newer $1)" ]
}
#
# Run the compiler
#
@ -378,7 +385,7 @@ compiler() {
start_command() {
local finished
finished=0
local restorefile
local object
do_it() {
local rc
@ -474,25 +481,16 @@ start_command() {
esac
if [ -n "${g_fast}${AUTOMAKE}" ]; then
if qt mywhich make; then
restorefile=$RESTOREFILE
if [ -z "$g_fast" ]; then
#
# Automake -- use the last compiled script
#
RESTOREFILE=firewall
fi
export RESTOREFILE
if ! make -qf ${CONFDIR}/Makefile; then
g_fast=
AUTOMAKE=
fi
RESTOREFILE=$restorefile
if [ -z "$g_fast" ]; then
#
# Automake -- use the last compiled script
#
object=firewall
else
object=$RESTOREFILE
fi
if ! uptodate ${VARDIR}/$object; then
g_fast=
AUTOMAKE=
fi
@ -753,15 +751,7 @@ restart_command() {
[ -n "$STARTUP_ENABLED" ] || fatal_error "Startup is disabled"
if [ -z "$g_fast" -a -n "$AUTOMAKE" ]; then
if qt mywhich make; then
#
# RESTOREFILE is exported by get_config()
#
restorefile=$RESTOREFILE
RESTOREFILE=firewall
make -qf ${CONFDIR}/Makefile && g_fast=Yes
RESTOREFILE=$restorefile
fi
uptodate ${VARDIR}/firewall && g_fast=Yes
fi
if [ -z "$g_fast" ]; then

45
Shorewall6/shorewall6
View File

@ -235,6 +235,13 @@ startup_error() {
exit 1
}
#
# Determine if there are config files newer than the passed object
#
uptodate() {
[ -z "$(find ${CONFDIR} -newer $1)" ]
}
#
# Run the appropriate compiler
#
@ -315,7 +322,7 @@ compiler() {
start_command() {
local finished
finished=0
local restorefile
local object
do_it() {
local rc
@ -406,24 +413,16 @@ start_command() {
esac
if [ -n "${g_fast}${AUTOMAKE}" ]; then
if qt mywhich make; then
restorefile=$RESTOREFILE
if [ -z "$g_fast" ]; then
#
# Autofast -- use the last compiled script
#
RESTOREFILE=firewall
fi
export RESTOREFILE
if ! make -qf ${CONFDIR}/Makefile; then
g_fast=
AUTOMAKE=
fi
RESTOREFILE=$restorefile
if [ -z "$g_fast" ]; then
#
# Autofast -- use the last compiled script
#
object=firewall
else
object=$RESTOREFILE
fi
if ! uptodate ${VARDIR}/$object; then
g_fast=
AUTOMAKE=
fi
@ -684,15 +683,7 @@ restart_command() {
[ -n "$STARTUP_ENABLED" ] || fatal_error "Startup is disabled"
if [ -z "$g_fast" -a -n "$AUTOMAKE" ]; then
if qt mywhich make; then
#
# RESTOREFILE is exported by get_config()
#
restorefile=$RESTOREFILE
RESTOREFILE=firewall
make -qf ${CONFDIR}/Makefile && g_fast=Yes
RESTOREFILE=$restorefile
fi
uptodate ${VARDIR}/firewall && g_fast=Yes
fi
if [ -z "$g_fast" ]; then