From 7ec51d01fcf6a544734820fa656f6e11b864f2e0 Mon Sep 17 00:00:00 2001 From: fnm3 Date: Thu, 21 Nov 2002 10:42:56 +0000 Subject: Fixed redefinition for -D_PATH_ETHERTYPES= --- userspace/ebtables2/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'userspace') diff --git a/userspace/ebtables2/Makefile b/userspace/ebtables2/Makefile index 59ebce2..dbf9a3f 100644 --- a/userspace/ebtables2/Makefile +++ b/userspace/ebtables2/Makefile @@ -21,13 +21,13 @@ else KERNEL_INCLUDES:=include/ endif -ETHERTYPESFILE1:="/etc/ethertypes" -ETHERTYPESFILE2:="/usr/local/etc/ethertypes" +#ETHERTYPESFILE:="/etc/ethertypes" +ETHERTYPESFILE:="/usr/local/etc/ethertypes" PROGSPECS:=-DPROGVERSION=\"$(PROGVERSION)\" \ -DPROGNAME=\"$(PROGNAME)\" \ -DPROGDATE=\"$(PROGDATE)\" \ - -D_PATH_ETHERTYPES1=\"$(ETHERTYPESFILE1)\" + -D_PATH_ETHERTYPES=\"$(ETHERTYPESFILE)\" all: ebtables @@ -36,7 +36,7 @@ communication.o: communication.c include/ebtables_u.h $(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $< -I$(KERNEL_INCLUDES) getethertype.o: getethertype.c include/ethernetdb.h - $(CC) $(CFLAGS) -c -o $@ $< -Iinclude/ + $(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $< -Iinclude/ ebtables.o: ebtables.c include/ebtables_u.h $(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $< -I$(KERNEL_INCLUDES) -- cgit v1.2.3