Apply Tuomo Soini's Makefile patch

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-03-14 10:57:41 -07:00
parent 7e14777b8f
commit aa503e7211
4 changed files with 8 additions and 4 deletions

View File

@ -12,7 +12,7 @@ $(VARDIR)/${RESTOREFILE}: $(VARDIR)/firewall
then \ then \
/sbin/shorewall-lite -q save >/dev/null; \ /sbin/shorewall-lite -q save >/dev/null; \
else \ else \
/sbin/shorewall-lite -q restart 2>&1 | tail >&2; \ /sbin/shorewall-lite -q restart 2>&1 | tail >&2; exit 1; \
fi fi
# EOF # EOF

View File

@ -2,6 +2,7 @@
VARDIR=$(shell /sbin/shorewall show vardir) VARDIR=$(shell /sbin/shorewall show vardir)
CONFDIR=/etc/shorewall CONFDIR=/etc/shorewall
RESTOREFILE?=firewall RESTOREFILE?=firewall
all: $(VARDIR)/${RESTOREFILE} all: $(VARDIR)/${RESTOREFILE}
$(VARDIR)/${RESTOREFILE}: $(CONFDIR)/* $(VARDIR)/${RESTOREFILE}: $(CONFDIR)/*
@ -11,11 +12,12 @@ $(VARDIR)/${RESTOREFILE}: $(CONFDIR)/*
then \ then \
/sbin/shorewall -q save >/dev/null; \ /sbin/shorewall -q save >/dev/null; \
else \ else \
/sbin/shorewall -q restart 2>&1 | tail >&2; \ /sbin/shorewall -q restart 2>&1 | tail >&2; exit 1; \
fi fi
clean: clean:
@rm -f $(CONFDIR)/*~ $(CONFDIR)/.*~ @rm -f $(CONFDIR)/*~ $(CONFDIR)/.*~
.PHONY: clean .PHONY: clean
# EOF # EOF

View File

@ -12,7 +12,7 @@ $(VARDIR)/${RESTOREFILE}: $(VARDIR)/firewall
then \ then \
/sbin/shorewall6-lite -q save >/dev/null; \ /sbin/shorewall6-lite -q save >/dev/null; \
else \ else \
/sbin/shorewall6-lite -q restart 2>&1 | tail >&2; \ /sbin/shorewall6-lite -q restart 2>&1 | tail >&2; exit 1; \
fi fi
# EOF # EOF

View File

@ -2,6 +2,7 @@
VARDIR=$(shell /sbin/shorewall6 show vardir) VARDIR=$(shell /sbin/shorewall6 show vardir)
CONFDIR=/etc/shorewall6 CONFDIR=/etc/shorewall6
RESTOREFILE?=firewall RESTOREFILE?=firewall
all: $(VARDIR)/${RESTOREFILE} all: $(VARDIR)/${RESTOREFILE}
$(VARDIR)/${RESTOREFILE}: $(CONFDIR)/* $(VARDIR)/${RESTOREFILE}: $(CONFDIR)/*
@ -11,11 +12,12 @@ $(VARDIR)/${RESTOREFILE}: $(CONFDIR)/*
then \ then \
/sbin/shorewall6 -q save >/dev/null; \ /sbin/shorewall6 -q save >/dev/null; \
else \ else \
/sbin/shorewall6 -q restart 2>&1 | tail >&2; \ /sbin/shorewall6 -q restart 2>&1 | tail >&2; exit 1; \
fi fi
clean: clean:
@rm -f $(CONFDIR)/*~ $(CONFDIR)/.*~ @rm -f $(CONFDIR)/*~ $(CONFDIR)/.*~
.PHONY: clean .PHONY: clean
# EOF # EOF