summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2000-12-01 09:39:28 +0000
committerobrien <obrien@FreeBSD.org>2000-12-01 09:39:28 +0000
commitcafb2a0daa952ef4a9f04e3ba3e8ab940a51ee68 (patch)
treebf9398e3cc9469cabb5ad72a85bacda3b33f6e34 /gnu
parentf5e9caf11e6f5f34714ba30c65368b7185a6cf6a (diff)
downloadFreeBSD-src-cafb2a0daa952ef4a9f04e3ba3e8ab940a51ee68.zip
FreeBSD-src-cafb2a0daa952ef4a9f04e3ba3e8ab940a51ee68.tar.gz
The GCC 2.96 snapshots have slightly different rules for finding include
files. Mostly -I${.CURDIR} was needed -- especially for YACC generated files as the new cpp does not look in the ultimate source file (ie, the .y file)'s directory as told by the "#line" directive. Some were misspellings of "-I${.CURDIR}" as "-I.".
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/groff/eqn/Makefile3
-rw-r--r--gnu/usr.bin/groff/pic/Makefile3
-rw-r--r--gnu/usr.bin/groff/refer/Makefile3
3 files changed, 6 insertions, 3 deletions
diff --git a/gnu/usr.bin/groff/eqn/Makefile b/gnu/usr.bin/groff/eqn/Makefile
index aba129e..795fcca 100644
--- a/gnu/usr.bin/groff/eqn/Makefile
+++ b/gnu/usr.bin/groff/eqn/Makefile
@@ -4,7 +4,6 @@ PROG= eqn
SRCS= eqn.cc eqn.tab.h main.cc lex.cc \
box.cc limit.cc list.cc over.cc text.cc \
script.cc mark.cc other.cc delim.cc sqrt.cc pile.cc special.cc
-CFLAGS+= -I.
DPADD= ${LIBGROFF}
LDADD= ${LIBGROFF}
MAN1= eqn.1 neqn.1
@@ -21,5 +20,7 @@ eqn.tab.h: eqn.cc
.include "../Makefile.cfg"
.include <bsd.prog.mk>
+INCLUDES+= -I${DIST_DIR} -I.
+
neqn: ${DIST_DIR}/neqn.sh
sed -e 's/@g@/${g}/g' ${.ALLSRC} > ${.TARGET}
diff --git a/gnu/usr.bin/groff/pic/Makefile b/gnu/usr.bin/groff/pic/Makefile
index de80054..bb799a3 100644
--- a/gnu/usr.bin/groff/pic/Makefile
+++ b/gnu/usr.bin/groff/pic/Makefile
@@ -3,7 +3,6 @@
PROG= pic
SRCS= lex.cc main.cc object.cc pic.cc pic.tab.h \
common.cc troff.cc tex.cc
-CFLAGS+= -I.
DPADD= ${LIBGROFF} ${LIBM}
LDADD= ${LIBGROFF} -lm
CLEANFILES= ${MAN1} pic.cc pic.tab.h y.tab.c y.tab.h
@@ -12,3 +11,5 @@ pic.tab.h: pic.cc
.include "../Makefile.cfg"
.include <bsd.prog.mk>
+
+INCLUDES+= -I${DIST_DIR} -I.
diff --git a/gnu/usr.bin/groff/refer/Makefile b/gnu/usr.bin/groff/refer/Makefile
index 4573443..b25f726 100644
--- a/gnu/usr.bin/groff/refer/Makefile
+++ b/gnu/usr.bin/groff/refer/Makefile
@@ -2,10 +2,11 @@
PROG= refer
SRCS= command.cc label.cc ref.cc refer.cc token.cc
-CFLAGS+= -I${.CURDIR}/../include
DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM}
LDADD= ${LIBBIB} ${LIBGROFF} -lm
CLEANFILES= label.cc label.tab.h ${MAN1} y.tab.c y.tab.h
.include "../Makefile.cfg"
.include <bsd.prog.mk>
+
+INCLUDES+= -I${DIST_DIR} -I${.CURDIR}/../include
OpenPOWER on IntegriCloud