From 6c97d528b92c2fd446d8beaaaa5401804947632f Mon Sep 17 00:00:00 2001
From: Bart De Schuymer <bdschuym@pandora.be>
Date: Wed, 19 Feb 2003 20:09:51 +0000
Subject: remove NONSTANDARD

---
 docs/ebtables-faq.html       |  2 +-
 userspace/ebtables2/INSTALL  |  2 +-
 userspace/ebtables2/Makefile | 10 +---------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/docs/ebtables-faq.html b/docs/ebtables-faq.html
index 7eaa304..1e7ab97 100644
--- a/docs/ebtables-faq.html
+++ b/docs/ebtables-faq.html
@@ -195,7 +195,7 @@
         The current userspace code is in the ebtables2/userspace/ebtables2 directory. To compile the
         CVS userspace tool you'll need to do the following:
 <PRE>
-# make NONSTANDARD=y KERNEL_INCLUDES=/usr/src/linux/include/
+# make KERNEL_INCLUDES=/usr/src/linux/include/
 # make install
 </PRE>
         Obviously you'll need to use the right kernel directory. Why is compiling the CVS different?
diff --git a/userspace/ebtables2/INSTALL b/userspace/ebtables2/INSTALL
index 8e9359c..b76987a 100644
--- a/userspace/ebtables2/INSTALL
+++ b/userspace/ebtables2/INSTALL
@@ -8,7 +8,7 @@ put the files in the right directories:
 
 If you are using the CVS code or need your own kernel includes, do this
 instead (change the include directory to the appropriate one):
-%make install NONSTANDARD=y KERNEL_INCLUDES=/usr/src/linux/include
+%make install KERNEL_INCLUDES=/usr/src/linux/include
 
 WHAT GETS INSTALLED?
 --------------------
diff --git a/userspace/ebtables2/Makefile b/userspace/ebtables2/Makefile
index 75ea552..cacb0ee 100644
--- a/userspace/ebtables2/Makefile
+++ b/userspace/ebtables2/Makefile
@@ -12,15 +12,7 @@ include extensions/Makefile
 
 OBJECTS:=getethertype.o ebtables.o communication.o $(EXT_OBJS)
 
-# Use the option NONSTANDARD=y when you don't want to use the kernel includes
-# that are included in this package. You should set KERNEL_INCLUDES to
-# the right directory (eg /usr/src/linux/include).
-# You should only need this when compiling the CVS or when adding new code.
-ifeq ($(NONSTANDARD), y)
-KERNEL_INCLUDES?=/usr/include/
-else
-KERNEL_INCLUDES:=include/
-endif
+KERNEL_INCLUDES?=include/
 
 ifeq ($(ETHERTYPESPATH),)
 ETHERTYPESPATH:=/etc/
-- 
cgit v1.2.3