summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>1999-08-16 06:17:14 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>1999-08-16 06:17:14 +0000
commite60e1a016abecb82e0f2fe21299ad46d1861845a (patch)
treedf0a554e0538457e81b1ab6be22a0585e79502f1 /gnu
parent9b55466aca389c9d73cd244d76c8f61af41972de (diff)
Notes
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/bison/Makefile9
-rw-r--r--gnu/usr.bin/bison/data/Makefile5
2 files changed, 7 insertions, 7 deletions
diff --git a/gnu/usr.bin/bison/Makefile b/gnu/usr.bin/bison/Makefile
index 89f0ed597786..b9c4c0d9f4e3 100644
--- a/gnu/usr.bin/bison/Makefile
+++ b/gnu/usr.bin/bison/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Makefile,v 1.5 1999/08/15 22:36:41 obrien 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}
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 140a6c41a243..fa5987af1dfa 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.7 1999/08/14 22:30:36 obrien 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 \