summaryrefslogtreecommitdiffstats
path: root/userspace/patches/incremental-patches/ebtables-v2.0pre5.002.diff
blob: 5b2d037bd165c8f57a8d69858ec32c77bc5f610b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
--- ebtables-v2.0pre5.001/Makefile	Mon May 20 13:59:48 2002
+++ ebtables-v2.0pre5.002/Makefile	Mon May 20 14:06:38 2002
@@ -2,12 +2,19 @@
 
 KERNEL_DIR?=/usr/src/linux
 PROGNAME:=ebtables
-PROGVERSION:="2.0pre5 (April 2002)"
+PROGVERSION:="2.0pre5 (May 2002)"
 
 MANDIR?=/usr/local/man
 CFLAGS:=-Wall -Wunused
 include extensions/Makefile
 
+# Some kernel testers prefer to use a symlink for /usr/include/linux
+ifeq ($(SYMLINK), y)
+KERNEL_INCLUDES=symlink
+else
+KERNEL_INCLUDES=headers
+endif
+
 .PHONY: headers
 headers:
 	mkdir -p /usr/include/linux/netfilter_bridge
@@ -18,6 +25,10 @@
 	cp -f $(KERNEL_DIR)/include/linux/netfilter_bridge.h \
 		/usr/include/linux/netfilter_bridge.h
 
+.PHONY: symlink
+symlink:
+	ln -fs $(KERNEL_DIR)/include/linux /usr/include/linux
+
 communication.o: communication.c include/ebtables_u.h
 	$(CC) $(CFLAGS) -c -o $@ $<
 
@@ -36,7 +47,7 @@
 	mkdir -p $(@D)
 	install -m 0644 -o root -g root $< $@
 
-install: $(MANDIR)/man8/ebtables.8 headers \
+install: $(MANDIR)/man8/ebtables.8 $(KERNEL_INCLUDES) \
 	ebtables /etc/ethertypes
 
 clean:
--- ebtables-v2.0pre5.001/THANKS	Sat Apr 13 17:40:35 2002
+++ ebtables-v2.0pre5.002/THANKS	Mon May 20 13:49:50 2002
@@ -6,4 +6,4 @@
 Jason Lunz
 Tim Gardner
 Loïc Minier
-
+Nick Fedchik
--- ebtables-v2.0pre5.001/ChangeLog	Mon May 20 13:59:48 2002
+++ ebtables-v2.0pre5.002/ChangeLog	Mon May 20 13:49:27 2002
@@ -1,5 +1,7 @@
+20020520
 	* update help for -s and -d
 	* add VLAN in ethertypes
+	* add SYMLINK option for compiling
 20020501
 	* allow -i and --logical-in in BROUTING
 	* update the manual page