Permalink
Browse files

flex/lex: Activate flex 2.5.37, deactivate lex 2.5.4

Flex is a bootstrap tool.  This swaps the new flex for the old lex.
The old lex subdirectory should stay in place for around a week in case
we need to revert this change for any reason.
  • Loading branch information...
1 parent 553fe7b commit f506e60df4a2ee3cc470ddcbad8a149f756bec0f @jrmarino jrmarino committed Jan 16, 2013
Showing with 3 additions and 3 deletions.
  1. +2 −2 Makefile.inc1
  2. +1 −1 usr.bin/Makefile
View
@@ -768,7 +768,7 @@ BSTRAPDIRS= ${_strfile} \
bin/hostname bin/kill \
usr.bin/yacc usr.bin/colldef usr.bin/uudecode usr.bin/xinstall \
usr.bin/m4 usr.bin/rpcgen usr.bin/bmake usr.bin/awk usr.bin/stat \
- usr.bin/find usr.bin/lex usr.bin/sed usr.bin/uname usr.bin/touch \
+ usr.bin/find usr.bin/flex usr.bin/sed usr.bin/uname usr.bin/touch \
usr.bin/mkdep usr.bin/mktemp usr.bin/lorder usr.bin/file2c \
usr.bin/tsort usr.bin/tr usr.bin/join usr.bin/wc usr.bin/basename \
usr.bin/gencat usr.bin/chflags usr.bin/expand usr.bin/paste \
@@ -940,7 +940,7 @@ secure/lib/libssh__L: secure/lib/libcrypto__L lib/libz__L
_generic_libs+= secure/lib
.endif
-_generic_libs+= usr.bin/lex/lib
+_generic_libs+= usr.bin/flex/lib
.for _lib in ${_startup_libs44} ${_startup_libs47} \
${_startup_libs} ${_prebuild_libs} ${_generic_libs}
View
@@ -65,6 +65,7 @@ SUBDIR= alias \
file2c \
find \
finger \
+ flex \
fmt \
fold \
from \
@@ -101,7 +102,6 @@ SUBDIR= alias \
less \
lessecho \
lesskey \
- lex \
limits \
locale \
locate \

0 comments on commit f506e60

Please sign in to comment.