From 9cd4d748f903aafb25e36dff2988340c01293e32 Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Fri, 14 Aug 1998 06:35:37 +0000
Subject: [PATCH] /usr/src/usr.bin/lex/Makefile puts FlexLexer.h into
 /usr/include/g++, but flex still generates "#include <FlexLexer.h".  As a
 result, C++ sources flex generates failed to be compiled.

PR:		7575
Reviewed by:	phk
Submitted by:	MOROHOSHI Akihiko <moro@remus.dti.ne.jp>
---
 usr.bin/lex/lex.1  | 2 +-
 usr.bin/lex/main.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr.bin/lex/lex.1 b/usr.bin/lex/lex.1
index e135a49d7ecf..d05cdab7b10b 100644
--- a/usr.bin/lex/lex.1
+++ b/usr.bin/lex/lex.1
@@ -3196,7 +3196,7 @@ When using this option, flex defaults to generating the scanner to the file
 instead of
 .B lex.yy.c.
 The generated scanner includes the header file
-.I FlexLexer.h,
+.I g++/FlexLexer.h,
 which defines the interface to two C++ classes.
 .PP
 The first class,
diff --git a/usr.bin/lex/main.c b/usr.bin/lex/main.c
index bc1e8c9c3bd1..2b04f6cf77a2 100644
--- a/usr.bin/lex/main.c
+++ b/usr.bin/lex/main.c
@@ -32,7 +32,7 @@ char copyright[] =
  All rights reserved.\n";
 #endif /* not lint */
 
-/* $Header: /home/ncvs/src/usr.bin/lex/main.c,v 1.1.1.2 1996/06/19 20:26:16 nate Exp $ */
+/* $Header: /home/ncvs/src/usr.bin/lex/main.c,v 1.3 1996/06/19 20:47:29 nate Exp $ */
 
 
 #include "flexdef.h"
@@ -1006,7 +1006,7 @@ _( "Variable trailing context rules entail a large performance penalty\n" ) );
 
 	if ( C_plus_plus )
 		{
-		outn( "\n#include <FlexLexer.h>" );
+		outn( "\n#include <g++/FlexLexer.h>" );
 
 		if ( yyclass )
 			{