From 931781f8a7bbba478ee2fba605b7f2d79b68260e Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 5 Apr 2004 02:03:24 +0000 Subject: [PATCH] Undo the last commit. Utility programs which install c++ includes have no knowledge and should have no knowledge of particular compiler versions installed. They should install their C++ header files in one place. --- usr.bin/lex/Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile index 3ebc95f45d..6b6e689ef4 100644 --- a/usr.bin/lex/Makefile +++ b/usr.bin/lex/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/usr.bin/lex/Makefile,v 1.15.2.3 2002/07/22 14:21:52 ru Exp $ -# $DragonFly: src/usr.bin/lex/Makefile,v 1.3 2004/04/04 21:31:14 joerg Exp $ +# $DragonFly: src/usr.bin/lex/Makefile,v 1.4 2004/04/05 02:03:24 dillon Exp $ # # By default, flex will be configured to generate 8-bit scanners only if the # -8 flag is given. If you want it to always generate 8-bit scanners, add @@ -19,11 +19,8 @@ SRCS= scan.c ccl.c dfa.c ecs.c gen.c main.c misc.c nfa.c parse.y \ skel.c sym.c tblcmp.c yylex.c LFLAGS+= -is CFLAGS+= -I. -I${.CURDIR} -INCSGROUPS= gcc2_INCS gcc3_INCS -gcc2_INCS= FlexLexer.h -gcc2_INCSDIR= ${INCLUDEDIR}/c++/2.95 -gcc3_INCS= FlexLexer.h -gcc3_INCSDIR= ${INCLUDEDIR}/c++/3.3 +INCS= FlexLexer.h +INCSDIR= ${INCLUDEDIR}/g++ MLINKS+= lex.1 flex.1 MLINKS+= lex.1 flex++.1 MLINKS+= lex.1 lex++.1 -- 2.28.0