From aa503e721176f4f992b17bd3513083276d2d8e61 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Wed, 14 Mar 2012 10:57:41 -0700
Subject: [PATCH] Apply Tuomo Soini's Makefile patch

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall-lite/Makefile  | 2 +-
 Shorewall/Makefile       | 4 +++-
 Shorewall6-lite/Makefile | 2 +-
 Shorewall6/Makefile      | 4 +++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Shorewall-lite/Makefile b/Shorewall-lite/Makefile
index c30ccb88b..591d5fa11 100644
--- a/Shorewall-lite/Makefile
+++ b/Shorewall-lite/Makefile
@@ -12,7 +12,7 @@ $(VARDIR)/${RESTOREFILE}: $(VARDIR)/firewall
 	then \
 	    /sbin/shorewall-lite -q save >/dev/null; \
 	else \
-	    /sbin/shorewall-lite -q restart 2>&1 | tail >&2; \
+	    /sbin/shorewall-lite -q restart 2>&1 | tail >&2; exit 1; \
 	fi
 
 # EOF
diff --git a/Shorewall/Makefile b/Shorewall/Makefile
index 0858a16e7..80f511dfa 100644
--- a/Shorewall/Makefile
+++ b/Shorewall/Makefile
@@ -2,6 +2,7 @@
 VARDIR=$(shell /sbin/shorewall show vardir)
 CONFDIR=/etc/shorewall
 RESTOREFILE?=firewall
+
 all: $(VARDIR)/${RESTOREFILE}
 
 $(VARDIR)/${RESTOREFILE}: $(CONFDIR)/*
@@ -11,11 +12,12 @@ $(VARDIR)/${RESTOREFILE}: $(CONFDIR)/*
 	then \
 	    /sbin/shorewall -q save >/dev/null; \
 	else \
-	    /sbin/shorewall -q restart 2>&1 | tail >&2; \
+	    /sbin/shorewall -q restart 2>&1 | tail >&2; exit 1; \
 	fi
 
 clean:
 	@rm -f $(CONFDIR)/*~ $(CONFDIR)/.*~
+
 .PHONY: clean
 
 # EOF
diff --git a/Shorewall6-lite/Makefile b/Shorewall6-lite/Makefile
index 1c672e43e..a7a8ba78e 100644
--- a/Shorewall6-lite/Makefile
+++ b/Shorewall6-lite/Makefile
@@ -12,7 +12,7 @@ $(VARDIR)/${RESTOREFILE}: $(VARDIR)/firewall
 	then \
 	    /sbin/shorewall6-lite -q save >/dev/null; \
 	else \
-	    /sbin/shorewall6-lite -q restart 2>&1 | tail >&2; \
+	    /sbin/shorewall6-lite -q restart 2>&1 | tail >&2; exit 1; \
 	fi
 
 # EOF
diff --git a/Shorewall6/Makefile b/Shorewall6/Makefile
index 61fe447cb..a05377601 100644
--- a/Shorewall6/Makefile
+++ b/Shorewall6/Makefile
@@ -2,6 +2,7 @@
 VARDIR=$(shell /sbin/shorewall6 show vardir)
 CONFDIR=/etc/shorewall6
 RESTOREFILE?=firewall
+
 all: $(VARDIR)/${RESTOREFILE}
 
 $(VARDIR)/${RESTOREFILE}: $(CONFDIR)/*
@@ -11,11 +12,12 @@ $(VARDIR)/${RESTOREFILE}: $(CONFDIR)/*
 	then \
 	    /sbin/shorewall6 -q save >/dev/null; \
 	else \
-	    /sbin/shorewall6 -q restart 2>&1 | tail >&2; \
+	    /sbin/shorewall6 -q restart 2>&1 | tail >&2; exit 1; \
 	fi
 
 clean:
 	@rm -f $(CONFDIR)/*~ $(CONFDIR)/.*~
+
 .PHONY: clean
 
 # EOF