Fixes for Bison 1.25->1.28 upgrade.

This commit is contained in:
David E. O'Brien 1999-08-14 22:30:36 +00:00
parent 2f2ac2cb9d
commit 08937b5aac
2 changed files with 7 additions and 7 deletions

View File

@ -1,4 +1,4 @@
# $Id$
# $Id: Makefile,v 1.3 1997/02/22 15:44:42 peter Exp $
.PATH: ${.CURDIR}/../../../contrib/bison
@ -9,14 +9,13 @@ MAN1= bison.1
DATADIR= ${SHAREDIR}/misc
CFLAGS+= -DSTDC_HEADERS=1 -DHAVE_STRING_H=1 -DHAVE_STDLIB_H=1 -DHAVE_ALLOCA=1 \
-DHAVE_STRERROR=1
CFLAGS= -DHAVE_CONFIG_H
CFLAGS+= -DXPFILE=\"${DATADIR}/bison.simple\"
CFLAGS+= -DXPFILE1=\"${DATADIR}/bison.hairy\"
CFLAGS+= -I${.CURDIR} -I${.OBJDIR}
SRCS+= LR0.c allocate.c closure.c conflicts.c derives.c files.c \
getargs.c gram.c lalr.c lex.c main.c nullable.c output.c \
print.c reader.c reduce.c symtab.c warshall.c version.c \
getopt.c getopt1.c
print.c reader.c reduce.c symtab.c warshall.c getopt.c getopt1.c
.include <bsd.prog.mk>

View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.5 1997/02/22 15:44:44 peter Exp $
# $Id: Makefile,v 1.6 1997/08/21 03:28:07 jmg Exp $
BISONDIR=${.CURDIR}/../../../../contrib/bison
@ -12,7 +12,8 @@ all: bison.s1
# Copy bison.simple, inserting directory name into the #line commands.
bison.s1: bison.simple
sed -e "/^#line/ s|bison|${DATADIR}/bison|" \
< ${BISONDIR}/bison.simple > bison.s1
-e "s|@bison_version@|1.28|" \
< ${.ALLSRC} > ${.TARGET}
install:
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 bison.s1 \