Use Yacc rather than Bison.

5 files changed, 8 insertions, 12 deletions

diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index 51e88c3..2d4e77c 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.inc,v 1.32 1999/04/22 19:35:12 obrien Exp $
+# $Id: Makefile.inc,v 1.33 1999/04/22 20:12:21 obrien Exp $
 #
 
 .include "../Makefile.inc"
@@ -8,8 +8,6 @@
 .if !defined(GCCDIR)
 GCCDIR=		${.CURDIR}/../../../../contrib/egcs/gcc
 
-BISON?=		bison
-
 .if ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb"
 GCC_ARCH=mips
 .else
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index 603113d..0cc873d 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.14 1999/04/04 16:36:34 obrien Exp $
+# $Id: Makefile,v 1.15 1999/07/28 07:19:38 obrien Exp $
 #
 
 .include "../Makefile.inc"
@@ -20,7 +20,7 @@ CFLAGS+= -I${GCCDIR}/cp -I.
 
 .ORDER: parse.c parse.h
 parse.c parse.h: parse.y
-	${BISON} -d -o parse.c ${GCCDIR}/cp/parse.y
+	${YACC} -d -o parse.c ${GCCDIR}/cp/parse.y
 	grep '^#define[   ]*YYEMPTY' parse.c >>parse.h
 
 CLEANFILES+=	parse.c parse.h
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 1d4d3da..bdcb85b 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.32 1999/04/28 18:48:08 obrien Exp $
+# $Id: Makefile,v 1.33 1999/07/28 07:19:38 obrien Exp $
 #
 
 #
@@ -102,7 +102,7 @@ c-parse.c c-parse.h: c-parse.in
 	sed -e "/^ifobjc$$/,/^end ifobjc$$/d" \
 	    -e "/^ifc$$/d" -e "/^end ifc$$/d" \
 	    ${GCCDIR}/c-parse.in > c-parse.y
-	${BISON} -d -o c-parse.c c-parse.y
+	${YACC} -d -o c-parse.c c-parse.y
 	rm -f c-parse.y
 
 GENSRCS+=	c-parse.c c-parse.h
@@ -115,7 +115,7 @@ objc-parse.c objc-parse.h: c-parse.in
 	sed -e "/^ifc$$/,/^end ifc$$/d" \
 	    -e "/^ifobjc$$/d" -e "/^end ifobjc$$/d" \
 	    ${GCCDIR}/c-parse.in > objc-parse.y
-	${BISON} -d -o objc-parse.c objc-parse.y
+	${YACC} -d -o objc-parse.c objc-parse.y
 	rm -f objc-parse.y
 
 GENSRCS+=	objc-parse.c objc-parse.h
diff --git a/gnu/usr.bin/cc/cccp/Makefile b/gnu/usr.bin/cc/cccp/Makefile
index 881c5f5..eec6ef3 100644
--- a/gnu/usr.bin/cc/cccp/Makefile
+++ b/gnu/usr.bin/cc/cccp/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.13 1999/03/05 04:55:03 obrien Exp $
+#	$Id: Makefile,v 1.12 1999/04/04 16:36:35 obrien Exp $
 
 .include "../Makefile.inc"
 
@@ -7,7 +7,6 @@
 PROG=	cpp
 SRCS=	cccp.c cexp.y obstack.c prefix.c version.c
 CFLAGS+= -DPREFIX=\"/usr\"
-YACC=	${BISON}
 YFLAGS=
 BINDIR=	/usr/libexec
 MAN1=	cccp.1
diff --git a/gnu/usr.bin/cc/cpp/Makefile b/gnu/usr.bin/cc/cpp/Makefile
index 881c5f5..eec6ef3 100644
--- a/gnu/usr.bin/cc/cpp/Makefile
+++ b/gnu/usr.bin/cc/cpp/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.13 1999/03/05 04:55:03 obrien Exp $
+#	$Id: Makefile,v 1.12 1999/04/04 16:36:35 obrien Exp $
 
 .include "../Makefile.inc"
 
@@ -7,7 +7,6 @@
 PROG=	cpp
 SRCS=	cccp.c cexp.y obstack.c prefix.c version.c
 CFLAGS+= -DPREFIX=\"/usr\"
-YACC=	${BISON}
 YFLAGS=
 BINDIR=	/usr/libexec
 MAN1=	cccp.1