pre-release target for Makefile.

diff --git a/INSTALL b/INSTALL
index dafd4c32c3b134e2ffcae3cb87c8c65a47fd42a1..f391d2c1c42c7167832471522bea77868e28378c 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,14 +1,13 @@
 FOLLOW THESE STEPS:
 
-1) If /usr/src/linux contains the kernel headers of a recent 2.4
-   kernel:
-       % make
-   Otherwise:
+0) There may be some outstanding bugfixes or tweaks which are not yet
+   in the official kernel.  To look through these, do:
+       % make pending-patches KERNEL_DIR=<<where-your-kernel-is>>
+
+1) Next, make the package.
        % make KERNEL_DIR=<<where-your-kernel-is>>
 
 2) Finally, you need to to install the shared libraries, and the binary:
-       # make install
-   Or
        # make install KERNEL_DIR=<<where-your-kernel-is>>
 
 If you are a developer, you can install the libipq headers, like:

diff --git a/Makefile b/Makefile
index 6d73c1b4375c37688e2326a55c7f15deceddba8a..0a833075f62392060bf5af429b7c75c653ec5acd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,11 @@ endif
 NETFILTER_VERSION:=1.2
 OLD_NETFILTER_VERSION:=1.1.2
 
+# Waiting for inclusions in the kernel tree.
+PENDING_PATCHES:=dropped-table.patch
+# These went in previous kernels.
+PENDING_PATCHES+=ipv6-fixes.patch.ipv6 masquerade+fwmark.patch nat-overlap.patch ppc-sparc-mangle.patch
+
 LIBDIR:=/usr/local/lib
 BINDIR:=/usr/local/sbin
 MANDIR:=/usr/local/man
@@ -50,6 +55,9 @@ default: print-extensions all
 print-extensions:
        @[ -n "$(OPTIONALS)" ] && echo Extensions found: $(OPTIONALS)
 
+pending-patches:
+       @cd patch-o-matic && KERNEL_DIR=$(KERNEL_DIR) ./runme $(PENDING_PATCHES)
+
 iptables.o: iptables.c
        $(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $<