Fix Makefile and 'shorewall start f'

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3657 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

Shorewall/Makefile

@@ -1,9 +1,10 @@
 # Shorewall Makefile to restart if config-files are newer than last restart
 VARDIR=/var/lib/shorewall
 CONFDIR=/etc/shorewall
-all: $(VARDIR)/.restore
+RESTOREFILE?=restore
+all: $(VARDIR)/${RESTOREFILE}
 
-$(VARDIR)/.restore: $(CONFDIR)/*
+$(VARDIR)/${RESTOREFILE}: $(CONFDIR)/*
 	@/sbin/shorewall -q save >/dev/null; \
 	if \
 	    /sbin/shorewall -q restart >/dev/null 2>&1; \

Shorewall/changelog.txt

@@ -1,4 +1,8 @@
-Changes in 3.1.x.
+Changes in 3.2.0 Beta 2
+
+1)  Make "shorewall start -f" work correctly.
+
+Changes in 3.1.x. and 3.2.x
 
 1) Removal of dynamic zones.
 

Shorewall/releasenotes.txt

@@ -1,4 +1,4 @@
-Shorewall 3.2.0 Beta 1.
+Shorewall 3.2.0 Beta 2.
 
 Note to users upgrading from Shorewall 2.x or 3.0
 
@@ -27,22 +27,12 @@ Note to users upgrading from Shorewall 2.x or 3.0
    Please see the "Migration Considerations" below for additional upgrade
    information.
 
-Problems Corrected in 3.2.0 Beta 1
+Problems Corrected in 3.2.0 Beta 2
 
-1)  The /etc/shorewall/params file is now copied into the compiled program
-    so that its contents are processed both at compile-time and at
-    run-time. The latter is required so that extension scripts will have
-    access to the variables that the file initializes.
-
-2)  The iptable_mangle and iptable_nat modules were previously omitted from
-    /etc/shorewall/modules.
-
-Other changes in 3.2.0 Beta 1
-
-1)  By default, the program generated by the "shorewall compile" command
-    cannot be installed into /etc/init.d/ unless the "-d <distro>" option
-    is given. This will make the default behavior distribution-neutral
-    which is what it should be.
+1)  The Makefile is now sensitive to the RESTOREFILE variable if that
+    variable is defined at make time. The /sbin/shorewall script has been
+    updated to define RESTOREFILE when it invokes 'make' during processing
+    of the "shorewall start -f" command.
 
 Migration Considerations:
 

Shorewall/shorewall

@@ -583,7 +583,7 @@ start_command() {
 
     if [ -n "$FAST" ]; then
 	if qt mywhich make; then
-	    make -qf /etc/shorewall/Makefile || FAST=
+	    RESTOREFILE=$RESTOREFILE make -qf /etc/shorewall/Makefile || FAST=
 	fi
 
 	if [ -n "$FAST" ]; then