Relocate Flexlexer.h to /usr/include

FlexLexer was placed in /usr/include/c++ but this is not the normal
location nor is it a search path for either base compiler.  I believe
this is a legacy that should have been changed when the c++ search
path changed.

diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc
index f8b975f..315c0f5 100644 (file)
--- a/Makefile_upgrade.inc
+++ b/Makefile_upgrade.inc
@@ -2113,6 +2113,7 @@ TO_REMOVE+=/usr/share/man/cat2/aio_waitcomplete.2.gz
 TO_REMOVE+=/usr/share/man/man2/aio_waitcomplete.2.gz
 TO_REMOVE+=/usr/share/man/cat2/aio_write.2.gz
 TO_REMOVE+=/usr/share/man/man2/aio_write.2.gz
+TO_REMOVE+=/usr/include/c++/FlexLexer.h
 
 .if ${MACHINE_ARCH} == "x86_64"
 TO_REMOVE+=/usr/sbin/stlstats

diff --git a/usr.bin/flex/Makefile b/usr.bin/flex/Makefile
index 0dacb85..3eabe90 100644 (file)
--- a/usr.bin/flex/Makefile
+++ b/usr.bin/flex/Makefile
@@ -17,7 +17,6 @@ MLINKS+=      flex.1 lex++.1
 MLINKS+=       flex.1 flex++.1
 
 INCS=          FlexLexer.h
-INCSDIR=       ${INCLUDEDIR}/c++
 
 SUBDIR=                lib