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

Have AUTOMAKE follow CONFIG_PATH

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-06-07 08:51:36 -07:00
parent 9c2c562bf5
commit 9fb2ab718c
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Shorewall/shorewall
View File

@ -330,7 +330,24 @@ startup_error() {
# Determine if there are config files newer than the passed object # Determine if there are config files newer than the passed object
# #
uptodate() { uptodate() {
[ -f $1 ] && [ -z "$(find ${CONFDIR} -newer $1)" ] [ -f $1 ] || return 1
local dir
local ifs
ifs="$IFS"
IFS=':'
for dir in $CONFIG_PATH; do
if [ -n "$(find ${dir} -newer $1)" ]; then
IFS="$ifs"
return 1;
fi
done
IFS="$ifs"
return 0
} }
# #

19
Shorewall6/shorewall6
View File

@ -330,7 +330,24 @@ startup_error() {
# Determine if there are config files newer than the passed object # Determine if there are config files newer than the passed object
# #
uptodate() { uptodate() {
[ -f $1 ] && [ -z "$(find ${CONFDIR} -newer $1)" ] [ -f $1 ] || return 1
local dir
local ifs
ifs="$IFS"
IFS=':'
for dir in $CONFIG_PATH; do
if [ -n "$(find ${dir} -newer $1)" ]; then
IFS="$ifs"
return 1;
fi
done
IFS="$ifs"
return 0
} }
# #