From 2934176b5daaca464e0e594ef11449e6ffbff690 Mon Sep 17 00:00:00 2001
From: Bart De Schuymer <bdschuym@pandora.be>
Date: Tue, 1 Apr 2003 17:29:13 +0000
Subject: *** empty log message ***

---
 userspace/ebtables2/INSTALL  |  8 ++++----
 userspace/ebtables2/Makefile | 12 ++++--------
 2 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'userspace')

diff --git a/userspace/ebtables2/INSTALL b/userspace/ebtables2/INSTALL
index 9f44910..86f14d2 100644
--- a/userspace/ebtables2/INSTALL
+++ b/userspace/ebtables2/INSTALL
@@ -15,10 +15,10 @@ WHAT GETS INSTALLED?
   To put the manual somewhere else, include MANDIR=<<man-path/man>> as
   option on the command line.
   The Makefile will append /man8/ebtables.8.
-- ethertypes is by default placed in /usr/local/etc/, if you
-  want to change this, include ETHERTYPESPATH=<<path/>>.
-
+- ethertypes is by default placed in /etc/, if you
+  want to change this, include ETHERTYPESPATH=<<path>>.
 - the userspace program ebtables is compiled and the executable is copied
-  to /sbin/ebtables.
+  by default to /sbin/ebtables. If you want to put the executable
+  somewhere else, include BINPATH=<<path>>.
 
 That's all
diff --git a/userspace/ebtables2/Makefile b/userspace/ebtables2/Makefile
index cacb0ee..77e0f2e 100644
--- a/userspace/ebtables2/Makefile
+++ b/userspace/ebtables2/Makefile
@@ -14,14 +14,10 @@ OBJECTS:=getethertype.o ebtables.o communication.o $(EXT_OBJS)
 
 KERNEL_INCLUDES?=include/
 
-ifeq ($(ETHERTYPESPATH),)
-ETHERTYPESPATH:=/etc/
-endif
-ETHERTYPESFILE:=$(ETHERTYPESPATH)ethertypes
-
-ifeq ($(BINPATH),)
-BINPATH:=/sbin/
-endif
+ETHERTYPESPATH?=/etc/
+ETHERTYPESFILE:=$(ETHERTYPESPATH)/ethertypes
+
+BINPATH?=/sbin/
 BINFILE:=$(BINPATH)ebtables
 
 PROGSPECS:=-DPROGVERSION=\"$(PROGVERSION)\" \
-- 
cgit v1.2.3