diff options
| author | obrien <obrien@FreeBSD.org> | 1999-08-14 22:30:36 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-08-14 22:30:36 +0000 |
| commit | 9ab63a4a40caabd6ebad7cb6ec46cd213fa81320 (patch) | |
| tree | 6bb6d36fa81984ad372f6ec8ca63d2800910d4c7 /gnu | |
| parent | b35a17e3c929d733b09b214f85e4b5cfc7adea6e (diff) | |
| download | FreeBSD-src-9ab63a4a40caabd6ebad7cb6ec46cd213fa81320.zip FreeBSD-src-9ab63a4a40caabd6ebad7cb6ec46cd213fa81320.tar.gz | |
Fixes for Bison 1.25->1.28 upgrade.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/bison/Makefile | 9 | ||||
| -rw-r--r-- | gnu/usr.bin/bison/data/Makefile | 5 |
2 files changed, 7 insertions, 7 deletions
diff --git a/gnu/usr.bin/bison/Makefile b/gnu/usr.bin/bison/Makefile index 89f0ed5..de1cef3 100644 --- a/gnu/usr.bin/bison/Makefile +++ b/gnu/usr.bin/bison/Makefile @@ -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> diff --git a/gnu/usr.bin/bison/data/Makefile b/gnu/usr.bin/bison/data/Makefile index 140a6c4..52e10db 100644 --- a/gnu/usr.bin/bison/data/Makefile +++ b/gnu/usr.bin/bison/data/Makefile @@ -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 \ |
