summaryrefslogtreecommitdiff
blob: bd5d926ce218c5dcca73656ef881c5f8e5f2dd96 (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
diff -Nru milter-regex-1.7.orig/Makefile.linux milter-regex-1.7/Makefile.linux
--- milter-regex-1.7.orig/Makefile.linux	2007-01-11 17:49:52.000000000 +0200
+++ milter-regex-1.7/Makefile.linux	2008-02-18 10:17:35.000000000 +0200
@@ -6,13 +6,12 @@
 # see milter-regex.init for an init script for RedHat/Fedora
 # (contributed by admin@2ka.mipt.ru)
 
-CFLAGS=		-g
-LDFLAGS=	-lmilter -lpthread
+LIBS=	-lmilter -lpthread
 
 all: milter-regex milter-regex.cat8
 
 milter-regex: milter-regex.o eval.o strlcpy.o y.tab.o
-	gcc -o milter-regex milter-regex.o eval.o strlcpy.o y.tab.o $(LDFLAGS)
+	gcc $(LDFLAGS) -o milter-regex milter-regex.o eval.o strlcpy.o y.tab.o $(LIBS)
 
 milter-regex.o: milter-regex.c eval.h
 	gcc $(CFLAGS) -c milter-regex.c
@@ -27,7 +26,7 @@
 	gcc $(CFLAGS) -c y.tab.c
 
 y.tab.c: parse.y
-	yacc -d parse.y
+	yacc -d -y parse.y
 
 milter-regex.cat8: milter-regex.8
 	nroff -Tascii -mandoc milter-regex.8 > milter-regex.cat8
diff -Nru milter-regex-1.7.orig/parse.y milter-regex-1.7/parse.y
--- milter-regex-1.7.orig/parse.y	2007-01-11 17:49:52.000000000 +0200
+++ milter-regex-1.7/parse.y	2008-02-18 10:16:02.000000000 +0200
@@ -71,6 +71,7 @@
 	} v;
 	int lineno;
 } YYSTYPE;
+#define YYSTYPE_IS_DECLARED 1
 
 %}
 
@@ -481,9 +482,9 @@
 		*r = rs;
 		return (0);
 	}
-#ifdef __linux__
-	(void)&yyrcsid; /* warning about yyrcsid declared but unused */
-#endif
+//#ifdef __linux__
+//	(void)&yyrcsid; /* warning about yyrcsid declared but unused */
+//#endif
 }
 
 static int