[openap-cvs] : iptables Rules.make,1.1.1.1,1.2 Makefile,1.1.1.1,1.2

[David Kimdon <address@hidden>]

Update of /cvsroot/openap/iptables
In directory subversions:/tmp/cvs-serv14588

Modified Files:
        Rules.make Makefile 
Log Message:
Integrate into OpenAP

Index: Rules.make
===================================================================
RCS file: /cvsroot/openap/iptables/Rules.make,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Rules.make  20 May 2002 00:32:23 -0000      1.1.1.1
+++ Rules.make  20 May 2002 01:01:26 -0000      1.2
@@ -10,11 +10,11 @@
        rm -f extensions/initext.c extensions/initext6.c
        @find . -name '*.[ao]' -o -name '*.so' | xargs rm -f
 
-install: all $(EXTRA_INSTALLS)
-       @if [ -f /usr/local/bin/iptables -a "$(BINDIR)" = "/usr/local/sbin" ];\
-       then echo 'Erasing iptables from old location (now /usr/local/sbin).';\
-       rm -f /usr/local/bin/iptables;\
-       fi
+install: all
+       mkdir -p $(IMAGE_DIR)/sbin
+       $(INSTALL) -s iptables $(IMAGE_DIR)/sbin
+       mkdir -p $(IMAGE_DIR)/usr/lib/iptables
+       $(INSTALL) -s extensions/libipt_MASQUERADE.so 
$(IMAGE_DIR)/usr/lib/iptables
 
 install-experimental: $(EXTRA_INSTALLS_EXP)
 

Index: Makefile
===================================================================
RCS file: /cvsroot/openap/iptables/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile    20 May 2002 00:32:23 -0000      1.1.1.1
+++ Makefile    20 May 2002 01:01:26 -0000      1.2
@@ -11,12 +11,12 @@
 TOPLEVEL_INCLUDED=YES
 
 ifndef KERNEL_DIR
-KERNEL_DIR=/usr/src/linux
+KERNEL_DIR=../linux
 endif
 NETFILTER_VERSION:=1.2.6a
 OLD_NETFILTER_VERSION:=1.2.5
 
-PREFIX:=/usr/local
+PREFIX:=/usr
 LIBDIR:=$(PREFIX)/lib
 BINDIR:=$(PREFIX)/sbin
 MANDIR:=$(PREFIX)/man
@@ -24,11 +24,6 @@
 
 # directory for new iptables releases
 RELEASE_DIR:=/tmp
-
-# Need libc6 for this.  FIXME: Should covert to autoconf.
-ifeq ($(shell [ -f /usr/include/netinet/ip6.h ] && echo YES), YES)
-DO_IPV6=1
-endif
 
 COPT_FLAGS:=-O2
 CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include -Iinclude/ 
-DNETFILTER_VERSION=\"$(NETFILTER_VERSION)\" #-g #-pg # -DIPTC_DEBUG